Revert "version7 (endless loop is fixed)"

This reverts commit 9ed39b73900aea17fb563940581e3943b1c0da2b.