diff --git a/lib/Bytecode/Writer/SlotCalculator.cpp b/lib/Bytecode/Writer/SlotCalculator.cpp
index 197f20601a6..478216d145d 100644
--- a/lib/Bytecode/Writer/SlotCalculator.cpp
+++ b/lib/Bytecode/Writer/SlotCalculator.cpp
@@ -171,7 +171,6 @@ void SlotCalculator::processModule() {
       }
       getOrCreateSlot(I->getType());
     }
-    processSymbolTableConstants(&F->getValueSymbolTable());
   }
 
   // Insert constants that are named at module level into the slot pool so that
@@ -233,15 +232,6 @@ void SlotCalculator::processValueSymbolTable(const ValueSymbolTable *VST) {
     getOrCreateSlot(VI->second);
 }
 
-void SlotCalculator::processSymbolTableConstants(const ValueSymbolTable *VST) {
-  // Now do the constant values in all planes
-  for (ValueSymbolTable::const_iterator VI = VST->begin(), VE = VST->end(); 
-       VI != VE; ++VI)
-    if (isa<Constant>(VI->second) && !isa<GlobalValue>(VI->second))
-      getOrCreateSlot(VI->second);
-}
-
-
 void SlotCalculator::incorporateFunction(const Function *F) {
   assert((ModuleLevel.empty() ||
           ModuleTypeLevel == 0) && "Module already incorporated!");
@@ -270,14 +260,6 @@ void SlotCalculator::incorporateFunction(const Function *F) {
     for (constant_iterator CI = constant_begin(F), CE = constant_end(F);
          CI != CE; ++CI)
       getOrCreateSlot(*CI);
-
-    // If there is a symbol table, it is possible that the user has names for
-    // constants that are not being used.  In this case, we will have problems
-    // if we don't emit the constants now, because otherwise we will get
-    // symbol table references to constants not in the output.  Scan for these
-    // constants now.
-    //
-    processSymbolTableConstants(&F->getValueSymbolTable());
   }
 
   SC_DEBUG("Inserting Instructions:\n");
diff --git a/lib/Bytecode/Writer/SlotCalculator.h b/lib/Bytecode/Writer/SlotCalculator.h
index 6cddb30f99a..353a97a1d1a 100644
--- a/lib/Bytecode/Writer/SlotCalculator.h
+++ b/lib/Bytecode/Writer/SlotCalculator.h
@@ -132,7 +132,6 @@ private:
   //
   void processTypeSymbolTable(const TypeSymbolTable *ST);
   void processValueSymbolTable(const ValueSymbolTable *ST);
-  void processSymbolTableConstants(const ValueSymbolTable *ST);
 
   // insertPrimitives - helper for constructors to insert primitive types.
   void insertPrimitives();
diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp
index a2e8fe566d3..a7d4b005ab7 100644
--- a/lib/Bytecode/Writer/Writer.cpp
+++ b/lib/Bytecode/Writer/Writer.cpp
@@ -1112,8 +1112,6 @@ void BytecodeWriter::outputFunction(const Function *F) {
   // Get slot information about the function...
   Table.incorporateFunction(F);
 
-  outputConstants(true);
-
   // Output all of the instructions in the body of the function
   outputInstructions(F);