Revert changes in patch for bug-883829
Merge pull request #10697 from steveck-chung/patch-revert

Revert changes in patch for bug-883829. a=revert