diff --git a/clang/include/clang/Analysis/PathSensitive/Environment.h b/clang/include/clang/Analysis/PathSensitive/Environment.h
index fde8b167f3c7..f94792a0cbf1 100644
--- a/clang/include/clang/Analysis/PathSensitive/Environment.h
+++ b/clang/include/clang/Analysis/PathSensitive/Environment.h
@@ -30,9 +30,8 @@ class EnvironmentManager;
 class BasicValueFactory;
 class LiveVariables;
 
-class Environment : public llvm::FoldingSetNode {
+class Environment {
 private:
-    
   friend class EnvironmentManager;
   
   // Type definitions.