Revert "Merge pull request #15454 from vingtetun/bug959425"

This reverts commit a9b0aca976cd9fe4c44546a9f9c1eaee6b25f59d, reversing
changes made to 73a7e0c15969a058964e92fad1925efead38dcfc.