This reverts commit 86f7d707. The test cases added for this exposed an pre-existing bug that is failing the expensive checks bot. Reverting so I can revert that patch.
