Revert "Map merge try 2?"

This reverts commit ab5ce2522a3b52fccaa9096a6188339dea40985b.