004a5fe6c5
This reverts commit 86f5da2d8f.
Reason for revert: Test fails in 2-button mode
Change-Id: I20163a658f731cf6ef27ce84f5f7c06919b7b9cd