diff --git a/http/client.go b/http/client.go
index 0e2b1b428..c32dd86ae 100644
--- a/http/client.go
+++ b/http/client.go
@@ -1755,22 +1755,22 @@ func (n nopCloser) Close() error {
 
 func (c *InternalClient) doWithRetry(req *http.Request) (*http.Response, error) {
 	sleepDuration := time.Second
-	newBody := nopCloser{}
+	var bod []byte
+	var err error
 	if req.Body != nil {
-		bod, err := ioutil.ReadAll(req.Body)
+		bod, err = ioutil.ReadAll(req.Body)
 		if err != nil {
 			return nil, errors.Wrap(err, "reading body")
 		}
-		newBody.Reader = bytes.NewReader(bod)
-		req.Body = newBody
+		req.Body = nopCloser{bytes.NewReader(bod)}
 	}
 	resp, err := c.httpClient.Do(req)
 	// start timer after first request, so if retryPeriod > 0 we
 	// pretty much always do at least one retry
 	start := time.Now()
 	for ; err != nil || resp.StatusCode < 200 || resp.StatusCode >= 300; resp, err = c.httpClient.Do(req) {
-		if newBody.Reader != nil {
-			newBody.Seek(0, io.SeekStart)
+		if req.Body != nil {
+			req.Body = nopCloser{bytes.NewReader(bod)} // can't seek due to races with http lib internals
 		}
 		if time.Since(start) > c.retryPeriod {
 			break