Revert "Version2"

This reverts commit 15876e779a044a098dbd413163497891727dd6af.