Revert "Map Changes"

This reverts commit 0efaa439222b28107ae80f02056eefd1aa732f62.