Revert "Map changes"

This reverts commit 5f7fb63b5a120eb7de60ccd9b2a05e0c075f5200.