Revert "Revert changes installed by xwidgets merge"