Revert "Merge pull request #14453 from arroway/bug-945111"

https://bugzilla.mozilla.org/show_bug.cgi?id=945111#c27

This reverts commit c17ce6040081294f8b6b3ed52decd6788da20dce, reversing
changes made to ba2cd3f149cb2e39b8d0449b4e862b036884a248.