Revert "Changes made to try to fix button bug"

This reverts commit 209ca7d559db77fbcf29c8de2185e461c8159f50.
Changes made to fix button bug