Revert "Experiment with button events."

Bug: 11167

This reverts commit 7c87af29befcc91ba2e890dd822a4a69cb3263d9.