Revert "Merge pull request #12206 from qdot/915920"

This reverts commit 604e110b1387fe868f39b392e039a57aea129ccc, reversing
changes made to 173076ae0a1eca9a9644d05382629f8d5ea870f3.