Reverts map changes

'Cause I can't mapmerge.