diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bbcbcc09d..8bac62805f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,3 @@
-## 0.7.0 (UNRELEASED)
-
 ## 0.6.4 (UNRELEASED)
 
 BACKWARDS INCOMPATIBILITIES:
diff --git a/version.go b/version.go
index c45bedfbeb..40678a06cc 100644
--- a/version.go
+++ b/version.go
@@ -7,9 +7,9 @@ var (
 )
 
 // The main version number that is being run at the moment.
-const Version = "0.7.0"
+const Version = "0.6.4"
 
 // A pre-release marker for the version. If this is "" (empty string)
 // then it means that it is a final release. Otherwise, this is a pre-release
 // such as "dev" (in development), "beta", "rc1", etc.
-const VersionPrerelease = "dev"
+const VersionPrerelease = "rc3"