Bug 844461 addendum - Fix faulty rebasing. r=bustage, a=bustage.