Bug 946178, revert "Merge pull request #14259 from jaoo/933203" for Mnw bustage

This reverts commit 71e2fcdaf3a6b86d11645ab1163e037179f591a3, reversing
changes made to f9901db71b8e5a70da1700ae82b66231bc000660.