Revert "GC triggering performance optimizations"

Breaks build, merge when tested

This reverts commit 6224f41fa8fbdb5b5ecc9ef8c12baa7ee7a67e72.

Change-Id: I65e619d64cb042c0df3b54d01b94a5054599ece8