This reverts commit 60ee778e. Reason for revert: 1924-frame-pop-toggle fails on some configs. Change-Id: Ib8386f62d0eb43da7236e07b4b171914a523dce5