Backed out changeset 00cead8f21d4 (bug 965464, should have been bug 965474)

--HG--
extra : rebase_source : 43997ecb392c716aa147407985b6f823ac087db8
Bug 965474 - allow for an initial sync on new user signin. r=ckarlof

--HG--
extra : rebase_source : f5fd22db384606112900b2caef11cc7bdc262f98
Bug 966122: fix typo that led to "Verify" button missing its label, r=markh

--HG--
extra : rebase_source : bf0b6d1117cc246d9990a197457063e1e81ce164