Revert "Merge branch 'sox' into 2.1sox"

This reverts commit bbe814af05191553b7f19bb35f6bff78eaf6f659.