This breaks TestAccessController.testAccessControllerUserPermsRegexHandling This reverts commit 66e90dece2b95bd2eb322b5a17ae180a735597da.