take permutations in to regard
Merge branch 'OONIBear' into remove-e4x
Revert "Merge branch 'OONIBear' into remove-e4x"

This reverts commit a85b4827d25595b5148de7c5708b836c377418b4, reversing
changes made to 55956b83790ff4c542c20a07028a9f267e59c1ed.