Revert "Fixed infinite loop described in INT-3453."