Reverted to match tmhOAuth style