Revert "Version one"

This reverts commit 066f94e120f45b214a818727bc7140dc1f4ef660.