have a look at the current diff, I think you rebased too quickly ;) I changed all this in my patch in https://bugzilla.mozilla.org/show_bug.cgi?id=929027, you should not revert my changes :)