diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/functions/ETagFromHttpResponseViaRegex.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/functions/ETagFromHttpResponseViaRegex.java
index fd455aa183..8212a89f4f 100644
--- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/functions/ETagFromHttpResponseViaRegex.java
+++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/functions/ETagFromHttpResponseViaRegex.java
@@ -36,7 +36,7 @@ import com.google.common.base.Function;
 @Singleton
 public class ETagFromHttpResponseViaRegex implements Function<HttpResponse, String> {
    private static Pattern pattern = Pattern.compile("<ETag>([\\S&&[^<]]+)</ETag>");
-   private static Pattern quotPattern = Pattern.compile("(&quot;)");
+   private static String ESCAPED_QUOTE = "&quot;";
    private final ReturnStringIf2xx returnStringIf200;
 
    @Inject
@@ -52,16 +52,8 @@ public class ETagFromHttpResponseViaRegex implements Function<HttpResponse, Stri
          Matcher matcher = pattern.matcher(content);
          if (matcher.find()) {
             value = matcher.group(1);
-            Matcher quotMatcher = quotPattern.matcher(value);
-            StringBuffer quotBuffer = new StringBuffer();
-            boolean foundUnescapedQuote = false;
-            while (quotMatcher.find()) {
-               quotMatcher.appendReplacement(quotBuffer, "\"");
-               foundUnescapedQuote = true;
-            }
-            if (foundUnescapedQuote) {
-               quotMatcher.appendTail(quotBuffer);
-               value = quotBuffer.toString();
+            if (value.indexOf(ESCAPED_QUOTE) != -1) {
+               value = value.replace(ESCAPED_QUOTE, "\"");
             }
          }
       }