Revert "Merge branch 'unordered-masking'"

This reverts commit 05ad17f06f8ec08ad071ebcdc4ee3985172e8833, reversing
changes made to aacbfe2aa19a7cba6090566edfefdb82b303db9f.