Revert "Add infinite loop"