diff --git a/include/boost/http_proto/impl/sink.hpp b/include/boost/http_proto/impl/sink.hpp
index aa064261..f2d53331 100644
--- a/include/boost/http_proto/impl/sink.hpp
+++ b/include/boost/http_proto/impl/sink.hpp
@@ -58,11 +58,9 @@ write_impl(
         while(
             p != tmp_end &&
             it != end_);
-        rv += on_write(
-            true,
-            boost::span<
-                buffers::const_buffer const>(
-                    tmp, p - tmp),
+        rv += on_write(boost::span<
+            buffers::const_buffer const>(
+                tmp, p - tmp),
             it != end_ || more);
         if(rv.ec.failed())
             return rv;
diff --git a/include/boost/http_proto/impl/source.hpp b/include/boost/http_proto/impl/source.hpp
index dbfdf36d..30eada32 100644
--- a/include/boost/http_proto/impl/source.hpp
+++ b/include/boost/http_proto/impl/source.hpp
@@ -58,11 +58,9 @@ read_impl(
         while(
             p != tmp_end &&
             it != end_);
-        rv += on_read(
-            true,
-            boost::span<
-                buffers::mutable_buffer const>(
-                    tmp, p - tmp));
+        rv += on_read(boost::span<
+            buffers::mutable_buffer const>(
+                tmp, p - tmp));
         if(rv.ec.failed())
             return rv;
         if(rv.finished)
diff --git a/include/boost/http_proto/sink.hpp b/include/boost/http_proto/sink.hpp
index f49b9299..7e19be50 100644
--- a/include/boost/http_proto/sink.hpp
+++ b/include/boost/http_proto/sink.hpp
@@ -192,7 +192,6 @@ struct BOOST_SYMBOL_VISIBLE
     virtual
     results
     on_write(
-        bool boost_span_issue_202_workaround,
         boost::span<const buffers::const_buffer> bs,
         bool more);
 
@@ -213,13 +212,13 @@ struct BOOST_SYMBOL_VISIBLE
         return on_write(b, more);
     }
 
-    // results
-    // write_impl(
-    //     boost::span<const buffers::const_buffer> const& bs,
-    //     bool more)
-    // {
-    //     return on_write(bs, more);
-    // }
+    results
+    write_impl(
+        boost::span<const buffers::const_buffer> const& bs,
+        bool more)
+    {
+        return on_write(bs, more);
+    }
 
     template<class T>
     results
diff --git a/include/boost/http_proto/source.hpp b/include/boost/http_proto/source.hpp
index e8b9e5c1..968cfac0 100644
--- a/include/boost/http_proto/source.hpp
+++ b/include/boost/http_proto/source.hpp
@@ -195,7 +195,6 @@ struct BOOST_SYMBOL_VISIBLE
     virtual
     results
     on_read(
-        bool boost_span_issue_202_workaround,
         boost::span<buffers::mutable_buffer const> bs);
 
 private:
@@ -206,12 +205,12 @@ struct BOOST_SYMBOL_VISIBLE
         return on_read(b);
     }
 
-    // results
-    // read_impl(
-    //     boost::span<buffers::mutable_buffer const> const& bs)
-    // {
-    //     return on_read(bs);
-    // }
+    results
+    read_impl(
+        boost::span<buffers::mutable_buffer const> const& bs)
+    {
+        return on_read(bs);
+    }
 
     template<class T>
     results
diff --git a/src/sink.cpp b/src/sink.cpp
index 6627791b..597dca72 100644
--- a/src/sink.cpp
+++ b/src/sink.cpp
@@ -15,7 +15,6 @@ namespace http_proto {
 auto
 sink::
 on_write(
-    bool,
     boost::span<buffers::const_buffer const> bs,
     bool more) ->
         results
diff --git a/src/source.cpp b/src/source.cpp
index e160104d..b2669f19 100644
--- a/src/source.cpp
+++ b/src/source.cpp
@@ -16,7 +16,6 @@ namespace http_proto {
 auto
 source::
 on_read(
-    bool,
     boost::span<buffers::mutable_buffer const> bs) ->
         results
 {