diff --git a/include/llvm/Transforms/IPO/SimpleStructMutation.h b/include/llvm/Transforms/IPO/SimpleStructMutation.h
index 62da4185dad..77b962b1079 100644
--- a/include/llvm/Transforms/IPO/SimpleStructMutation.h
+++ b/include/llvm/Transforms/IPO/SimpleStructMutation.h
@@ -8,28 +8,18 @@
 #ifndef LLVM_TRANSFORMS_SWAPSTRUCTCONTENTS_H
 #define LLVM_TRANSFORMS_SWAPSTRUCTCONTENTS_H
 
-#include "llvm/Pass.h"
+#include "llvm/Transforms/MutateStructTypes.h"
 
-class SwapStructContents : public Pass {
-  Pass *StructMutator;
+// FIXME: Move to correct location!
+class PrebuiltStructMutation : public MutateStructTypes {
 public:
-  // doPassInitialization - Figure out what transformation to do
-  //
-  bool doPassInitialization(Module *M);
+  enum Transform { SwapElements, SortElements };
 
-  // doPerMethodWork - Virtual method overriden by subclasses to do the
-  // per-method processing of the pass.
-  //
-  virtual bool doPerMethodWork(Method *M) {
-    return StructMutator->doPerMethodWork(M);
-  }
-
-  // doPassFinalization - Forward to our worker.
-  //
-  virtual bool doPassFinalization(Module *M) {
-    return StructMutator->doPassFinalization(M);
-  }
+  PrebuiltStructMutation(Module *M, enum Transform XForm)
+    : MutateStructTypes(getTransforms(M, XForm)) {}
 
+private:
+  static TransformsType getTransforms(Module *M, enum Transform);
 };
 
 #endif