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

Change-Id: If476245696bd5035d8961f2804587071d1560562