Applied Ere's global client-authentication patch.