This reverts commit f663dada. Bug: 116586190 Reason for revert: Fails gcstress (only?) test. Change-Id: I1478e69f5005cb5dad070f1ad70df6333c696bf7