Revert "GC triggering performance optimizations"

This reverts commit e5ae4f5e9d79995f659b17e78528536e4dd397a0.
Merge remote-tracking branch 'upstream/jellybean' into HEAD