Revert ad8cc60..6230cd7

This rolls back to commit ad8cc609b7cd8177f4202f8fffca7a87668e98ff.
test login_callback_on_client