backout http://hg.mozilla.org/mozilla-central/rev/ceb23e4d7554 due to state Errors