This reverts commit 50b04451. Reason for revert: Broke tests (debug-gc, gss, ss). Bug: 123772350 Change-Id: I3c7948b966f7e051e26b470cda5f6e5cb387ff54