Revert "Merge pull request #9664 from mozshiao9/master_bug866011"

This reverts commit 017cba5c3d0ccc1ad497d79c71797f9f40ff55e6, reversing
changes made to a69e90db36e091fdbaaf692bd983816d3897dcaa.