Made sure that none of the new agent functionality is interfering with the old code.

It should run normally, but if it does not, then another commit will be
coming to address this issue shortly.