Revert "#1016890 reapply contributed patch for fixing infinite loop - the...

Revert "#1016890 reapply contributed patch for fixing infinite loop - the reason it broke under Drush 4 was that I blew away our incorporation of the new cli context"

This reverts commit 0ae46243707c628a2a65dd3f69dac11c59586781.

It is breaking the upgrade path and any Migrate task, and possibly other stuff. See #1056864