We need to figure out how to restore this behavior or the performance tests will run out of memory.