Revert "Fixed Map"

This reverts commit 5fd13d23e89d5ce7fc394f81ba1c9ad3492fe8c1.