Revert "Minor map changes"

This reverts commit 01ebce7f94ec35f4cf8f23199192d89c5bcea446.