Ported changes from dev as a P2 fix: MOB-1744

Merge pull request #168 from Wikia/MOB-1744
MOB-1744 Restore map