diff --git a/include/llvm/Intrinsics.h b/include/llvm/Intrinsics.h
index 85e7802c77c..f5e525985b4 100644
--- a/include/llvm/Intrinsics.h
+++ b/include/llvm/Intrinsics.h
@@ -60,8 +60,7 @@ namespace Intrinsic {
     memset,         // Fill memory with a byte value
 
     // libm related functions.
-    isnan,          // Return true if fp argument is a NAN.
-    isunordered,    // Return true if fp arguments are unordered
+    isunordered,    // Return true if either argument is a NaN
 
     // Input/Output intrinsics.
     readport,
diff --git a/lib/Analysis/BasicAliasAnalysis.cpp b/lib/Analysis/BasicAliasAnalysis.cpp
index efaa7beb89b..9e8aed6f805 100644
--- a/lib/Analysis/BasicAliasAnalysis.cpp
+++ b/lib/Analysis/BasicAliasAnalysis.cpp
@@ -649,7 +649,7 @@ namespace {
 // that set errno on a domain or other error.
 static const char *DoesntAccessMemoryTable[] = {
   // LLVM intrinsics:
-  "llvm.frameaddress", "llvm.returnaddress", "llvm.readport", "llvm.isnan",
+  "llvm.frameaddress", "llvm.returnaddress", "llvm.readport", "llvm.isunordered",
 
   "abs", "labs", "llabs", "imaxabs", "fabs", "fabsf", "fabsl",
   "trunc", "truncf", "truncl", "ldexp",
diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp
index 4f6c997255d..82f3645acb1 100644
--- a/lib/VMCore/Function.cpp
+++ b/lib/VMCore/Function.cpp
@@ -223,7 +223,6 @@ unsigned Function::getIntrinsicID() const {
     if (getName() == "llvm.gcroot")  return Intrinsic::gcroot;
     break;
   case 'i':
-    if (getName() == "llvm.isnan") return Intrinsic::isnan;
     if (getName() == "llvm.isunordered") return Intrinsic::isunordered;
     break;
   case 'l':
diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index b832bd11747..40387d30153 100644
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -688,16 +688,6 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) {
     break;
   }
 
-  case Intrinsic::isnan:
-    Assert1(FT->getNumParams() == 1,
-            "Illegal # arguments for intrinsic function!", IF);
-    Assert1(FT->getReturnType() == Type::BoolTy,
-            "Return type is not bool!", IF);
-    Assert1(FT->getParamType(0)->isFloatingPoint(),
-            "Argument is not a floating point type!", IF);
-    NumArgs = 1;
-    break;
-
   case Intrinsic::isunordered:
     Assert1(FT->getNumParams() == 2,
             "Illegal # arguments for intrinsic function!", IF);