Revert 0d5473e..57d2c15

This rolls back to commit 0d5473e31ec33f8df1d9acab9d0400e74a9b4e8d.
Fixed Map Merge