This reverts commit r194330, r194329 and r194328.

The test was still failing on OS X and mingw.