Revert "fix ver2"

This reverts commit 8d5600c4aa0b6d7fd3326fb30d61da760a5f6bbe.
Revert "fix ver1"

This reverts commit 3fe30a509d5631fb78bb04668bfb6f7715b3a979.