Revert "Merge pull request #20556 from mcjimenez/bug1020158"

This reverts commit 06ea932d52fa5ec36285428c04ad6c7fdc413659, reversing
changes made to de4a53efe95f84e7f658d832d39ba2046448c3c8.