Revert "map"

This reverts commit 0bbc87df4d7d17c3971dab287fd9363c65293ba7.