diff --git a/go.mod b/go.mod
index c43f515c1d..1029e11dd8 100644
--- a/go.mod
+++ b/go.mod
@@ -70,9 +70,6 @@ require (
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 )
 
-// We want to replace the client-go version with a specific commit hash,
-// so that we don't get errors about being incompatible with the Go proxies.
-// See https://github.com/thanos-io/thanos/issues/1415
 replace (
 	// TODO(yeya24): This is just a temporary fork. Update it after
 	// https://github.com/cortexproject/cortex/pull/3000 is merged.
@@ -80,7 +77,7 @@ replace (
 	// Update to v1.1.1 to make sure windows CI pass.
 	github.com/elastic/go-sysinfo => github.com/elastic/go-sysinfo v1.1.1
 	// Make sure Prometheus version is pinned as Prometheus semver does not include Go APIs.
-	github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20200807135816-2899773b0159
+	github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20200811145323-f16cbc20d6f8
 	github.com/sercand/kuberesolver => github.com/sercand/kuberesolver v2.4.0+incompatible
 	google.golang.org/grpc => google.golang.org/grpc v1.29.1
 	k8s.io/klog => k8s.io/klog v0.3.1
diff --git a/go.sum b/go.sum
index 6ffb02f037..dd8716efcd 100644
--- a/go.sum
+++ b/go.sum
@@ -798,8 +798,8 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
 github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/prometheus v1.8.2-0.20200807135816-2899773b0159 h1:mT66e//l/+QugUat5A42YvIPxlsS6O/yr9UtjlDhPYw=
-github.com/prometheus/prometheus v1.8.2-0.20200807135816-2899773b0159/go.mod h1:zfAqy/MwhMFajB9E2n12/9gG2fvofIE9uKDtlZCDxqs=
+github.com/prometheus/prometheus v1.8.2-0.20200811145323-f16cbc20d6f8 h1:vfZ3abKEezjgxrbdHepzHI5iIHB3bzJxvXnmfKf+Or8=
+github.com/prometheus/prometheus v1.8.2-0.20200811145323-f16cbc20d6f8/go.mod h1:zfAqy/MwhMFajB9E2n12/9gG2fvofIE9uKDtlZCDxqs=
 github.com/rafaeljusto/redigomock v0.0.0-20190202135759-257e089e14a1 h1:+kGqA4dNN5hn7WwvKdzHl0rdN5AEkbNZd0VjRltAiZg=
 github.com/rafaeljusto/redigomock v0.0.0-20190202135759-257e089e14a1/go.mod h1:JaY6n2sDr+z2WTsXkOmNRUfDy6FN0L6Nk7x06ndm4tY=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
diff --git a/pkg/store/bucket_test.go b/pkg/store/bucket_test.go
index edc7200719..7ea5214912 100644
--- a/pkg/store/bucket_test.go
+++ b/pkg/store/bucket_test.go
@@ -1826,8 +1826,7 @@ func createBlockWithLargeChunk(t testutil.TB, dir string, lbls labels.Labels, ra
 	testutil.Ok(t, err)
 
 	for _, b := range blocksToCompact {
-		err := os.RemoveAll(b)
-		testutil.Ok(t, err)
+		testutil.Ok(t, os.RemoveAll(b))
 	}
 
 	db, err := tsdb.Open(dir, nil, nil, tsdb.DefaultOptions())