Revert "Fix Map Update"

This reverts commit 94a6f823b52c8199cfa41e81e12ae97f545f340b.