Revert back to old looping system.