This is now done in fxa-client.