Revert "Fix a hint insertion bug described by @redmunds" until we decide whether hint insertion or replacement is better.

This reverts commit de28553288d439ef2d459bd3c81cafb11c2e4ae3.