Revert "Map modification"

This reverts commit dd19b264dea31c9b132da973071ad84795b38055.