Going to switch this out to a separate bug as I don't want to delay landing this more than is necessary, for now this works fine.

https://bugzilla.mozilla.org/show_bug.cgi?id=862333 - bug for this