Remove the fallback logic for authorization check and stick to the production URL

Remove the fallback logic for authorization check and stick to the production URL #844