Revert "remove map and unmap domain"

This reverts commit 5e5b2fad7708a64318d7fc5ba971bf7687166e4a.