Improved, re:  Regarding: https://bugzilla.mozilla.org/show_bug.cgi?id=1092375

I love deleting functions!