diff --git a/changes/bug24898-029 b/changes/bug24898-029
index f56dee5c7..b33f09384 100644
--- a/changes/bug24898-029
+++ b/changes/bug24898-029
@@ -1,7 +1,6 @@
-  o Minor bugfixes:
+  o Minor bugfixes (relay):
     - Make the internal channel_is_client() function look at what sort
       of connection handshake the other side used, rather than whether
       the other side ever sent a create_fast cell to us. Backports part
-      of the fixes from bug 24898.
-
+      of the fixes from bugs 22805 and 24898.
 
diff --git a/src/or/command.c b/src/or/command.c
index 5866c386e..8831446f0 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -344,10 +344,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan)
     int len;
     created_cell_t created_cell;
 
-    /* Make sure we never try to use the OR connection on which we
-     * received this cell to satisfy an EXTEND request,  */
-    channel_mark_client(chan);
-
     memset(&created_cell, 0, sizeof(created_cell));
     len = onion_skin_server_handshake(ONION_HANDSHAKE_TYPE_FAST,
                                        create_cell->onionskin,