Revert performance tuning done via Bug 61350 as it lead to problems when running multi-threaded large regression tests.