This reverts commit 6f3becab15. This test works fine in 33, and lots of other tests fail, there is a more fundamental reason for this.
6f3becab15