This reverts commit 91023d79ec70df9289271e63a67675ee51e7dea8 as it increases memory usage for the test suite.