fixed previous commit (commented out double-visit protection and
disabled experimental ""short-circuit"" detection)