MWEB-1056: Cherry picked fix for restoring map
Merge pull request #5030 from Wikia/MWEB-1056

MWEB-1056: Cherry picked fix for restoring map