Rolling back infinite loop changes for now, to address a few edge cases.