I think once we have https://bugzilla.mozilla.org/show_bug.cgi?id=915880 we could avoid this?