Revert "Reland r206934 with a hopefully fixed test"

This reverts commit r207155.
The test was still failing.