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