Revert infinite loop implemented a commit ago...