Remove dependency on 1.8 auth