Merge "Revert "Refactor Bug report flow to work for all ADMIN users""