[Reviewer: Mike] Auth fun

Hi Mike - as discussed. This just reverts the relevant commits. Please can you review and merge. Thanks.