Don't use removed header
Merge pull request #6867 from wmtan/DoNotUseRemovedHeader

Don't use removed header