Back out bc75fd3095eb (bug 907958), the simple rebasing through bug 666399 is busted.  Probably a simple-ish fix, not gonna try it on a deadline, tho.  r=beep-beep-beep from a CLOSED TREE