T896471

https://bugzilla.mozilla.org/show_bug.cgi?id=896471

This is based off Bug 896500 in the interim.