diff --git a/go.mod b/go.mod
index 26cb4ffe..aacc96fd 100644
--- a/go.mod
+++ b/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.4.0
 	github.com/stretchr/testify v1.4.0
-	github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec
+	github.com/timakin/bodyclose v0.0.0-20190926151346-866fdb772e33
 	github.com/ultraware/funlen v0.0.2
 	github.com/ultraware/whitespace v0.0.3
 	github.com/valyala/quicktemplate v1.2.0
@@ -46,12 +46,7 @@ require (
 	mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f
 )
 
-replace (
-	// https://github.com/timakin/bodyclose/pull/20
-	github.com/timakin/bodyclose => github.com/golangci/bodyclose v0.0.0-20190924091105-43b3ff1b0de0
-
-	// https://github.com/golang/tools/pull/156
-	// https://github.com/golang/tools/pull/160
-	// https://github.com/golang/tools/pull/162
-	golang.org/x/tools => github.com/golangci/tools v0.0.0-20190915081525-6aa350649b1c
-)
+// https://github.com/golang/tools/pull/156
+// https://github.com/golang/tools/pull/160
+// https://github.com/golang/tools/pull/162
+replace golang.org/x/tools => github.com/golangci/tools v0.0.0-20190915081525-6aa350649b1c
diff --git a/go.sum b/go.sum
index 5db88ed2..7a774638 100644
--- a/go.sum
+++ b/go.sum
@@ -74,8 +74,6 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golangci/bodyclose v0.0.0-20190924091105-43b3ff1b0de0 h1:SOIRs5twdFsHlEhPmysNtHiveNIMdXcwUZgvN+tKFWc=
-github.com/golangci/bodyclose v0.0.0-20190924091105-43b3ff1b0de0/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0=
 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4=
 github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM=
@@ -227,6 +225,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/timakin/bodyclose v0.0.0-20190926151346-866fdb772e33 h1:x0Cqy/vndAeVooVIsYzYl3U+/dPj8p7hj1gwsXqWSeU=
+github.com/timakin/bodyclose v0.0.0-20190926151346-866fdb772e33/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 99689cca..d1986fbd 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -164,7 +164,7 @@ github.com/stretchr/objx
 github.com/stretchr/testify/assert
 github.com/stretchr/testify/mock
 github.com/stretchr/testify/require
-# github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec => github.com/golangci/bodyclose v0.0.0-20190924091105-43b3ff1b0de0
+# github.com/timakin/bodyclose v0.0.0-20190926151346-866fdb772e33
 github.com/timakin/bodyclose/passes/bodyclose
 # github.com/ultraware/funlen v0.0.2
 github.com/ultraware/funlen