Back out bug 844630 (7cdeee48963c) for being completely busted (and causing bug 848302). r=me