diff --git a/ndn-cpp/node.cpp b/ndn-cpp/node.cpp
index 2cf881f..e132970 100644
--- a/ndn-cpp/node.cpp
+++ b/ndn-cpp/node.cpp
@@ -88,8 +88,11 @@
   Data data;
   data.setContent(content);
   data.getMetaInfo().setTimestampMilliseconds(time(NULL) * 1000.0);
-  // TODO: Should we sign with a different key?
+#if 0
   KeyChain::defaultSign(data);
+#else
+#warning "Should we have the application use KeyChain.signData?"
+#endif
   Blob encodedData = data.wireEncode();
   
   // Create an interest where the name has the encoded Data packet.