remove that.
Merge pull request #7288 from Carreau/that/this

remove that.