This reverts commit 25bf4462. Reason for revert: Seems to break jit-gcstress test 989 Change-Id: Ia59833a2b80c6ab5a67483bf076bf08ba6769a40 Test: None