Revert "Fix BorderlessButtons build errors"

This reverts commit 149390999bb0910ecd7bbb130ae8c5887f5a618d.