diff --git a/include/llvm/MC/MCSection.h b/include/llvm/MC/MCSection.h
index 06d7e6af1e0..5eb8559c90a 100644
--- a/include/llvm/MC/MCSection.h
+++ b/include/llvm/MC/MCSection.h
@@ -31,35 +31,20 @@ namespace llvm {
     MCSection(const MCSection&);      // DO NOT IMPLEMENT
     void operator=(const MCSection&); // DO NOT IMPLEMENT
   protected:
-    MCSection(const StringRef &Name, MCContext &Ctx);
-    // FIXME: HACK.
+    MCSection(const StringRef &Name, SectionKind K, MCContext &Ctx);
     SectionKind Kind;
   public:
     virtual ~MCSection();
 
-    static MCSection *Create(const StringRef &Name, MCContext &Ctx);
+    static MCSection *Create(const StringRef &Name, SectionKind K,
+                             MCContext &Ctx);
     
     const std::string &getName() const { return Name; }
     SectionKind getKind() const { return Kind; }
   };
 
-  /// MCSectionWithKind - This is used by targets that use the SectionKind enum
-  /// to classify their sections.
-  class MCSectionWithKind : public MCSection {
-    MCSectionWithKind(const StringRef &Name, SectionKind K, MCContext &Ctx) 
-      : MCSection(Name, Ctx) {
-      Kind = K;
-    }
-  public:
-    
-    static MCSectionWithKind *Create(const StringRef &Name, SectionKind K,
-                                     MCContext &Ctx);
-
-  };
   
-  
-  
-  typedef MCSectionWithKind MCSectionELF;
+  typedef MCSection MCSectionELF;
   
 } // end namespace llvm
 
diff --git a/lib/MC/MCSection.cpp b/lib/MC/MCSection.cpp
index 2a2b0b6fafa..006546febb1 100644
--- a/lib/MC/MCSection.cpp
+++ b/lib/MC/MCSection.cpp
@@ -14,18 +14,15 @@ using namespace llvm;
 MCSection::~MCSection() {
 }
 
-MCSection::MCSection(const StringRef &N, MCContext &Ctx) : Name(N) {
+MCSection::MCSection(const StringRef &N, SectionKind K, MCContext &Ctx)
+  : Name(N), Kind(K) {
   MCSection *&Entry = Ctx.Sections[Name];
   assert(Entry == 0 && "Multiple sections with the same name created");
   Entry = this;
 }
 
-MCSection *MCSection::Create(const StringRef &Name, MCContext &Ctx) {
-  return new (Ctx) MCSection(Name, Ctx);
+MCSection *MCSection::Create(const StringRef &Name, SectionKind K,
+                             MCContext &Ctx) {
+  return new (Ctx) MCSection(Name, K, Ctx);
 }
 
-
-MCSectionWithKind *
-MCSectionWithKind::Create(const StringRef &Name, SectionKind K, MCContext &Ctx){
-  return new (Ctx) MCSectionWithKind(Name, K, Ctx);
-}
diff --git a/lib/Target/TargetLoweringObjectFile.cpp b/lib/Target/TargetLoweringObjectFile.cpp
index 9ba12bb2184..025e3f21b7c 100644
--- a/lib/Target/TargetLoweringObjectFile.cpp
+++ b/lib/Target/TargetLoweringObjectFile.cpp
@@ -249,7 +249,7 @@ getOrCreateSection(const char *Name, bool isDirective,
   if (MCSection *S = Ctx->GetSection(Name))
     return S;
   SectionKind K = SectionKind::get(Kind, false /*weak*/, !isDirective);
-  return MCSectionWithKind::Create(Name, K, *Ctx);
+  return MCSection::Create(Name, K, *Ctx);
 }
 
 
diff --git a/tools/llvm-mc/AsmParser.cpp b/tools/llvm-mc/AsmParser.cpp
index 19eaf353272..46103ad53b6 100644
--- a/tools/llvm-mc/AsmParser.cpp
+++ b/tools/llvm-mc/AsmParser.cpp
@@ -662,7 +662,7 @@ bool AsmParser::ParseDirectiveDarwinSection() {
   // FIXME: Arch specific.
   MCSection *S = Ctx.GetSection(Section);
   if (S == 0)
-    S = MCSection::Create(Section, Ctx);
+    S = MCSection::Create(Section, SectionKind(), Ctx);
   
   Out.SwitchSection(S);
   return false;
@@ -683,7 +683,7 @@ bool AsmParser::ParseDirectiveSectionSwitch(const char *Section,
   // FIXME: Arch specific.
   MCSection *S = Ctx.GetSection(Section);
   if (S == 0)
-    S = MCSection::Create(Section, Ctx);
+    S = MCSection::Create(Section, SectionKind(), Ctx);
   
   Out.SwitchSection(S);
   return false;
@@ -1074,7 +1074,7 @@ bool AsmParser::ParseDirectiveDarwinZerofill() {
     // FIXME: Arch specific.
     MCSection *S = Ctx.GetSection(Section);
     if (S == 0)
-      S = MCSection::Create(Section, Ctx);
+      S = MCSection::Create(Section, SectionKind(), Ctx);
     
     // Create the zerofill section but no symbol
     Out.EmitZerofill(S);
@@ -1134,7 +1134,7 @@ bool AsmParser::ParseDirectiveDarwinZerofill() {
   // FIXME: Arch specific.
   MCSection *S = Ctx.GetSection(Section);
   if (S == 0)
-    S = MCSection::Create(Section, Ctx);
+    S = MCSection::Create(Section, SectionKind(), Ctx);
   
   // Create the zerofill Symbol with Size and Pow2Alignment
   Out.EmitZerofill(S, Sym, Size, Pow2Alignment);
diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp
index 44a8319cd6b..745a64d62ab 100644
--- a/tools/llvm-mc/llvm-mc.cpp
+++ b/tools/llvm-mc/llvm-mc.cpp
@@ -191,7 +191,9 @@ static int AssembleInput(const char *ProgName) {
 
   // FIXME: Target hook & command line option for initial section.
   Str.get()->SwitchSection(MCSection::Create("__TEXT,__text,"
-                                             "regular,pure_instructions", Ctx));
+                                             "regular,pure_instructions",
+                                            SectionKind::get(SectionKind::Text),
+                                             Ctx));
 
   AsmParser Parser(SrcMgr, Ctx, *Str.get());
   OwningPtr<TargetAsmParser> TAP(GetTargetAsmParser(ProgName, Parser));