Revert "wx1.1"

This reverts commit ddaf841b0d2ed9aed86332aa4921139d4fe7465a.
Revert "Revert "wx1.1""

This reverts commit 34648404411463a14db5d44212688e6c5a5978be.