This appears still to be broken, but you know what?  We already have the agent
pointer; why not just get the ID from that?