#98 Back port "Rolled back changes to Authz as this causes StackOverflow...

Closes #98