This reverts commit 2de227e59c. This does not fix the issue we are having with :any: roles.
2de227e59c