Remove deprecated mapping.
Merge pull request #4186 from HassenRiahi/RemoveDeprecatedMapping

Remove deprecated mapping.