Revert "Merge hotfix on 'token-auth' into staging"

This reverts commit 457b1312b02f3ad9858d8ef78df258f05aebab23, reversing
changes made to f2d01b0d9fd4b0dbfd50a1eb4e5d13057d28a912.
Remove acl token stuff