The patch is there (1061), better fix than revert. This call to GetId() was a placeholder I later forgot about because this code is not compiled at all when using the CBP.
Other question is if the CC_NO_COLLAPSE_ITEM define must be removed from the CBP or added to makefile.am for coherency, but this is not urgent.