Revert "Merge pull request #15688 from vingtetun/bug961047"

This reverts commit 362b3642076f176c2b780cd512b4110ce20e7eee, reversing
changes made to f382061fe95750d584a9078175c421a36892afc9.