Revert "Merge pull request #19770 from tauzen/Bug1017572"

This reverts commit e794eeb8dcb308cd7b1580717ef38e2880987634, reversing
changes made to f6b5f77d47d103c672be388082f04709ccdf7f08.