Revert "Fix map id."

This reverts commit 097bc5deb76c516bc3a5d4b1ed122df46a8eb279.
Fix map id again.