Revert "Map Update - Bug Fixes"

This reverts commit a4fb4eb1787ce5c02c634aac59c54e70076fe749.