Revert "Merge pull request #12261 from snowmantw/issue905889"

https://bugzilla.mozilla.org/show_bug.cgi?id=905889

This patch, though applied cleanly on v1.2, result test errors.