This reverts commit b5f9612 because it is taking about 40% longer to run the tests, which is causing timeouts.
author