True. I guess we _do_ want to look up the entity, but just not use it to set the machine. I'll modify appropriately.