This reverts commit 63bcf891. Turns out the more targeted disablement in the previous change was good enough.