Revert "issue #3471 add map"

This reverts commit 6a2de9106a02f77cda25f63cd989bee3edd81617.