WORK IN PROGRESS!!

Ref: https://bugzilla.mozilla.org/show_bug.cgi?id=873091