Revert "Merge pull request #286 from jonhyman/feature/no-auth-clear-master"

This reverts commit dec51d631774638e36e118808b5e9a89a8e95a83, reversing
changes made to b6e499b6c75ddd2acb56b372b60b65be10104976.

[fixes #287]