Revert the section in Button Settings that we are no longer using.

Change-Id: I8876318c708982d78c166abb2bd91a0fd77de03b