Revert "Merge branch 'versioning'"

This reverts commit 8fe3be186d9c2013d149e43baef13dc274262064, reversing
changes made to e11f821f682369707ad7e0f49ae72e180cfdf82b.