Revert "Properly null check all button usages."

This reverts commit 550753238b9a6de8a7927979a417fb3e9b1f3762.