Shahid - Map Rescaling Issue
Revert "Shahid - Map Rescaling Issue"

This reverts commit 235337d2882a63b7a2ca01549c3ff3e63c65c274.