Revert "Fix map return types."

This reverts commit b5ed5de6dcd8c75e7c3df836b70331b7ca7f0695.