It turns out this helped on the version of stable I was using but not on master. This reverts commit 8df6e2d930.
8df6e2d930