This reverts commit 91023d79ec70df9289271e63a67675ee51e7dea8 as it increases memory usage for the test suite. Backport of 7d50d2bcb8a3cf3fea727174717ead7e6508e9e2 from master
This reverts commit 91023d79ec70df9289271e63a67675ee51e7dea8 as it increases memory usage for the test suite. Backport of 7d50d2bcb8a3cf3fea727174717ead7e6508e9e2 from master