--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -507,16 +507,17 @@ WeaveSvc.prototype = {
       // make sure we have a matching privkey
       let privkey = yield PrivKeys.get(self.cb, pubkey.privateKeyUri);
       if (privkey) {
         needKeys = false;
         ret = true;
       }
     }
 
+    // TODO: do not try the following if we're on Fennec:
     if (needKeys) {
       let pass = yield ID.get('WeaveCryptoID').getPassword(self.cb);
       if (pass) {
         let keys = PubKeys.createKeypair(pass, PubKeys.defaultKeyUri,
                                          PrivKeys.defaultKeyUri);
         try {
           yield keys.pubkey.put(self.cb);
           yield keys.privkey.put(self.cb);