revert @jrgm's auth-server work-around in issue #1451
Merge pull request #1477 from jrgm/revert-1451-fix-for-auth-server

revert @jrgm's auth-server work-around in issue #1451