Revert "Starting to revamp control scheme for buttons"

This reverts commit c1f63101b1109a281a5b8db350e5030de7946d81.