rolling back on that minor agent cleanup optimization, it was a bad idea

rolling back on that minor agent cleanup optimization, it was a bad idea #1318