Reverts screwy mapmerge

:-)
Fixes screwy mapchange.

Let's try this again.