Revert 'GC triggering performance optimizations'