Revert "Merge pull request #14262 from comoyo/935904"

This reverts commit 5684cd760e1644138cbe4733277b3ae442a9bda3, reversing
changes made to 84e58eb4d0a22a10dabfce9d6c28f60b5e50339e.
Merge pull request #14270 from comoyo/revert_935904

Bug 935904 - Revert "Merge pull request #14262 from comoyo/935904"