Merge Aaron's latest.
Don't use auth token handler for the moment; it breaks things.