I actually think we don't need this anymore? https://bugzilla.mozilla.org/show_bug.cgi?id=891882 seems fixed.