diff --git a/src/com/googlecode/utterlyidle/aws/AwsHttpClient.java b/src/com/googlecode/utterlyidle/aws/AwsHttpClient.java
index fa25a20d..9cb4f24a 100644
--- a/src/com/googlecode/utterlyidle/aws/AwsHttpClient.java
+++ b/src/com/googlecode/utterlyidle/aws/AwsHttpClient.java
@@ -32,17 +32,15 @@ public AwsHttpClient(final AuditHandler auditHandler, final AwsCredentialScope s
     public Response handle(Request request) throws Exception {
         AwsRequestDate date = AwsRequestDate.awsRequestDate(clock.now());
 
-        Request fullRequest = modify(request,
-                HttpMessage.Builder.header("host", request.uri().host()),
-                HttpMessage.Builder.header("x-amz-date", date.full())
-        );
+        Request fullRequest = request.
+                header("host", request.uri().host()).
+                header("x-amz-date", date.full());
 
         AwsCanonicalRequest canonicalRequest = new AwsCanonicalRequest(fullRequest);
 
-        Request signedRequest = modify(fullRequest,
-                HttpMessage.Builder.header("Authorization", buildAuthHeader(canonicalRequest, date)),
-                HttpMessage.Builder.header("x-amz-content-sha256", canonicalRequest.payloadHash())
-        );
+        Request signedRequest = fullRequest.
+                header("Authorization", buildAuthHeader(canonicalRequest, date)).
+                header("x-amz-content-sha256", canonicalRequest.payloadHash());
 
         return handler.handle(signedRequest);
     }