diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp
index 01bd2c7f899..b59cfd162f9 100644
--- a/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -882,16 +882,6 @@ void Interpreter::visitCallSite(CallSite CS) {
          e = SF.Caller.arg_end(); i != e; ++i, ++pNum) {
     Value *V = *i;
     ArgVals.push_back(getOperandValue(V, SF));
-    // Promote all integral types whose size is < sizeof(i32) into i32.
-    // We do this by zero or sign extending the value as appropriate
-    // according to the parameter attributes
-    const Type *Ty = V->getType();
-    if (Ty->isInteger() && (ArgVals.back().IntVal.getBitWidth() < 32)) {
-      if (CS.paramHasAttr(pNum, Attribute::ZExt))
-        ArgVals.back().IntVal = ArgVals.back().IntVal.zext(32);
-      else if (CS.paramHasAttr(pNum, Attribute::SExt))
-        ArgVals.back().IntVal = ArgVals.back().IntVal.sext(32);
-    }
   }
 
   // To handle indirect calls, we must get the pointer value from the argument
diff --git a/test/ExecutionEngine/interpreter-ext.ll b/test/ExecutionEngine/interpreter-ext.ll
new file mode 100644
index 00000000000..4aef45a0764
--- /dev/null
+++ b/test/ExecutionEngine/interpreter-ext.ll
@@ -0,0 +1,19 @@
+; RUN: lli -force-interpreter
+; Extending a value due to zeroext/signext will leave it the wrong size
+; causing problems later, such as a crash if you try to extend it again.
+
+define void @zero(i8 zeroext %foo) {
+  zext i8 %foo to i32
+  ret void
+}
+
+define void @sign(i8 signext %foo) {
+  sext i8 %foo to i32
+  ret void
+}
+
+define i32 @main() {
+  call void @zero(i8 0)
+  call void @sign(i8 0)
+  ret i32 0
+}