Revert "Another attempt to fix buttons disappearing"

This reverts commit 8e291759b14ab03837ecac266efdef72e18c4d15.