Revert "Minor map changes"

This reverts commit fc7413eb97f94616943c99faf4066d649ff0d667.