Revert "mapping"

This reverts commit e676f53e83acf1ed714539ac0d330ae4e0c3e11f.