diff -r 208a44ac3a5e -r 5832202f8a44 servlib/bundling/BundleProtocol.cc
--- a/servlib/bundling/BundleProtocol.cc	Tue Aug 16 15:43:46 2011 +0100
+++ b/servlib/bundling/BundleProtocol.cc	Tue Aug 16 16:08:39 2011 +0100
@@ -168,7 +168,8 @@
             continue;
         }
 
-        if (! xmit_blocks->has_block(i)) {
+        if (! xmit_blocks->has_block(i) &&
+            i != BundleProtocol::QUERY_EXTENSION_BLOCK) {
             if (i == BundleProtocol::QUERY_EXTENSION_BLOCK)
                 log_debug_p(LOG, "adding extra BPQ block!!!");
             bp->prepare(bundle, xmit_blocks, NULL, link, BlockInfo::LIST_NONE);