Fixes #7113

Flips the wiring around.
Merge pull request #7117 from PsiOmegaDelta/MapStuff

Fixes #7113
Deleting the map from master branch.
Merge pull request #7160 from Zuhayr/dev

Map merge?