Revert "Avoid calling idmap w/ trailing whitespace [2/2]"

Change-Id: I057df8ddd38466f2bd8c6153faaad02238e4b9d1