Revert "simplify map's block"

This reverts commit 282f02eb87b4956c7b660be9f7f9fa943c9c536f.