Revert "Merge pull request #14993 from comoyo/950607"

This reverts commit 8b1c262f730d90e75cebcd4d6d56a5452111962a, reversing
changes made to 27c7bba7991535bfd73172db241e1442d2359162.