This reverts commit 5b72d0e4. The test added is failing on Mac/Windows. See review for buildbot failure links.