Revert back to RectanglePushButtonDeprecated, see #137