Revert "Merge pull request #13928 from vingtetun/bug928612"

This reverts commit 76108aa3cb65f9bfa20e2fdb8c103e4940d1b811, reversing
changes made to 1cd5bef43a577ef2256a048269a4926c0f492470.