This reverts commit b095f022. Reason for revert: Caused huge interpreter performance regression. Change-Id: I0f27f8f234d315807695362bf679ef47f68723f7