Revert "map"

This reverts commit 9895ed99c8ba76a4732fb69d9d872fea23081d38.