Revert "Ensure the masks don't conflict with the ACL checks."