--- a/servlib/bundling/BPQResponse.cc	Thu Jun 30 14:29:54 2011 +0100
+++ b/servlib/bundling/BPQResponse.cc	Thu Jun 30 15:16:43 2011 +0100
@@ -75,16 +75,9 @@
                              buf(current_bi.full_length())
                            + current_bi.data_offset();
 
-        // it is intentional that the blocks are copied from 
-        // the api -> recv list
-        // API blocks should not exist before a bundle is sent 
-        // and will break an assertion in 
-        // bundling/PrimaryBlockProcessor.cc:
-        // ASSERTION FAILED (xmit_blocks->size() == 0) 
-        BlockInfo* new_bi = new_response->mutable_recv_blocks()->
-                            append_block(new_bp);
+        BlockInfo* new_bi = new_response->api_blocks()->append_block(new_bp);
         new_bp->init_block( new_bi,
-                            new_response->mutable_recv_blocks(),
+                            new_response->api_blocks(),
                             current_bi.type(),
                             current_bi.flags(),
                             data,

--- a/servlib/bundling/BundleDaemon.cc	Thu Jun 30 14:29:54 2011 +0100
+++ b/servlib/bundling/BundleDaemon.cc	Thu Jun 30 15:16:43 2011 +0100
@@ -545,9 +545,6 @@
                                              current_bundle,
                                              local_eid_);
 
-            BPQBlock foo(response);
-            ASSERT ( foo.kind() == BPQBlock::KIND_RESPONSE );
-
             BundleReceivedEvent e(response, EVENTSRC_CACHE);
             handle_event(&e);
 
@@ -966,7 +963,6 @@
     // If the even source is PEER, APP or STORE,
     // try to handle a BPQ block
     if ( event->source_ == EVENTSRC_PEER || 
-         event->source_ == EVENTSRC_APP  ||
          event->source_ == EVENTSRC_STORE ) {
         handle_bpq_block(bundle, event);
     }