
This reverts commit 380a5519cca999f54b17f37b709996a11f3204ea. This causes an assertion failure in debug_check_frame_counts() which probably isn't valid with this change; leaving the investigation for later now. Change-Id: Ieda5ca811ed2fa50a0cc6935919a8d10dca996e0