Revert "HHH-8127 OutOfMemoryError when running tests"

This reverts commit 11464ea0976343a27ddada0af4d0bca7182ce498.