Replace commented ButtonFacade support with working Masque support.