This reverts commit 334630ee. Reason for revert: 1924-frame-pop-toggle fails on some configs. Change-Id: I5ed3846e0dfff09c67a468f319ff516e14c44e61