@bcwaldon I don't understand your objection to this code. What Uwe is saying in his last comment is that the agent shouldn't be doing this in the first place and NewOfferFromJob will offer to all machines if given a nil. I think this is a reasonable place to leave this PR. We need to remove this code anyways so fixing it to be engine partition  aware doesn't really get us anything.