Revert "Merge pull request #38817 from steveKapturowski/master"

This reverts commit 9ec49bae13704b79cd3df9992d8b087d9e08bf0c, reversing
changes made to 9fd52ad4ac7cd922b6733dd8ce3a1c6ddad19063.

Will work on the hints a bit more and bring it back when it's ready.

Auditors: eater, alpert