Revert "Version 2"

This reverts commit 78be857144f89f365b5007a4cf18eb1cb3382e98.