diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyHeaders.java
index e639c7113f..13b210554e 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyHeaders.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/DefaultSpdyHeaders.java
@@ -240,16 +240,8 @@ public class DefaultSpdyHeaders extends SpdyHeaders {
     }
 
     @Override
-    public List<Map.Entry<String, String>> entries() {
-        List<Map.Entry<String, String>> all =
-                new LinkedList<Map.Entry<String, String>>();
-
-        HeaderEntry e = head.after;
-        while (e != head) {
-            all.add(e);
-            e = e.after;
-        }
-        return all;
+    public Iterator<Map.Entry<String, String>> iterator() {
+        return new HeaderIterator();
     }
 
     @Override
diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaders.java
index 3e073370d2..447d7d07f5 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaders.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyHeaders.java
@@ -38,11 +38,6 @@ public abstract class SpdyHeaders implements Iterable<Map.Entry<String, String>>
             return Collections.emptyList();
         }
 
-        @Override
-        public List<Map.Entry<String, String>> entries() {
-            return Collections.emptyList();
-        }
-
         @Override
         public boolean contains(String name) {
             return false;
@@ -90,7 +85,7 @@ public abstract class SpdyHeaders implements Iterable<Map.Entry<String, String>>
 
         @Override
         public Iterator<Map.Entry<String, String>> iterator() {
-            return entries().iterator();
+            return Collections.<Map.Entry<String, String>>emptyList().iterator();
         }
 
         @Override
@@ -420,10 +415,6 @@ public abstract class SpdyHeaders implements Iterable<Map.Entry<String, String>>
             frame.headers().set(HttpNames.VERSION, httpVersion.text());
         }
     }
-    @Override
-    public Iterator<Map.Entry<String, String>> iterator() {
-        return entries().iterator();
-    }
 
     /**
      * Returns the header value with the specified header name.  If there is
@@ -442,14 +433,6 @@ public abstract class SpdyHeaders implements Iterable<Map.Entry<String, String>>
      */
     public abstract  List<String> getAll(String name);
 
-    /**
-     * Returns all header names and values that this frame contains.
-     *
-     * @return the {@link List} of the header name-value pairs.  An empty list
-     *         if there is no header in this message.
-     */
-    public abstract  List<Map.Entry<String, String>> entries();
-
     /**
      * Returns {@code true} if and only if there is a header with the specified
      * header name.