Revert "Version 2"

This reverts commit 84c64b4e0397ca0d6b36aec3f3bbfa333401ce65.