#98 Back port "Rolled back changes to Authz as this causes StackOverflow Exception. (old bugid: 1107)" to 4.3.x