diff --git a/CHANGELOG.md b/CHANGELOG.md
index 383491ba..8eb23ba3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+1.0.0-b31
+
+WebSocket
+
+* Move the handler, don't copy it
+
+--------------------------------------------------------------------------------
+
 1.0.0-b30
 
 WebSocket
diff --git a/include/beast/websocket/impl/read.ipp b/include/beast/websocket/impl/read.ipp
index 8c715de5..4defa674 100644
--- a/include/beast/websocket/impl/read.ipp
+++ b/include/beast/websocket/impl/read.ipp
@@ -1059,15 +1059,8 @@ operator()(error_code const& ec, bool again)
         case 0:
             // read payload
             d.state = 1;
-#if 0
-            // VFALCO This causes dereference of null, because
-            //        the handler is moved from the data block
-            //        before asio_handler_deallocate is called.
             d.ws.async_read_frame(
                 d.fi, d.db, std::move(*this));
-#else
-            d.ws.async_read_frame(d.fi, d.db, *this);
-#endif
             return;
 
         // got payload