diff --git a/include/llvm/IR/Attributes.h b/include/llvm/IR/Attributes.h
index 5eca5d6d087..297abb96486 100644
--- a/include/llvm/IR/Attributes.h
+++ b/include/llvm/IR/Attributes.h
@@ -234,7 +234,10 @@ private:
 public:
   AttributeSet() : pImpl(0) {}
   AttributeSet(const AttributeSet &P) : pImpl(P.pImpl) {}
-  const AttributeSet &operator=(const AttributeSet &RHS);
+  const AttributeSet &operator=(const AttributeSet &RHS) {
+    pImpl = RHS.pImpl;
+    return *this;
+  }
 
   //===--------------------------------------------------------------------===//
   // Attribute List Construction and Mutation
diff --git a/lib/IR/AttributeImpl.h b/lib/IR/AttributeImpl.h
index b4fb0c0aa65..babc14e1fa8 100644
--- a/lib/IR/AttributeImpl.h
+++ b/lib/IR/AttributeImpl.h
@@ -165,6 +165,9 @@ public:
       ID.AddPointer(Nodes[i].second);
     }
   }
+
+  // FIXME: This atrocity is temporary.
+  uint64_t Raw(uint64_t Index) const;
 };
 
 } // end llvm namespace
diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp
index 1b057bbbb97..81390f0bc14 100644
--- a/lib/IR/Attributes.cpp
+++ b/lib/IR/Attributes.cpp
@@ -574,6 +574,24 @@ AttributeSetImpl(LLVMContext &C,
 #endif
 }
 
+uint64_t AttributeSetImpl::Raw(uint64_t Index) const {
+  for (unsigned I = 0, E = getNumAttributes(); I != E; ++I) {
+    if (getSlotIndex(I) != Index) continue;
+    const AttributeSetNode *ASN = AttrNodes[I].second;
+    AttrBuilder B;
+
+    for (AttributeSetNode::const_iterator II = ASN->begin(),
+           IE = ASN->end(); II != IE; ++II)
+      B.addAttributes(*II);
+
+    assert(B.Raw() == AttrList[I].Attrs.Raw() &&
+           "Attributes aren't the same!");
+    return B.Raw();
+  }
+
+  return 0;
+}
+
 //===----------------------------------------------------------------------===//
 // AttributeSet Method Implementations
 //===----------------------------------------------------------------------===//
@@ -669,14 +687,9 @@ AttributeSet AttributeSet::get(LLVMContext &C, ArrayRef<AttributeSet> Attrs) {
   return get(C, AttrList);
 }
 
-const AttributeSet &AttributeSet::operator=(const AttributeSet &RHS) {
-  pImpl = RHS.pImpl;
-  return *this;
-}
-
-/// getNumSlots - Return the number of slots used in this attribute list.
-/// This is the number of arguments that have an attribute set on them
-/// (including the function itself).
+/// \brief Return the number of slots used in this attribute list.  This is the
+/// number of arguments that have an attribute set on them (including the
+/// function itself).
 unsigned AttributeSet::getNumSlots() const {
   return pImpl ? pImpl->getNumAttributes() : 0;
 }
@@ -715,7 +728,7 @@ unsigned AttributeSet::getStackAlignment(unsigned Index) const {
 
 uint64_t AttributeSet::Raw(unsigned Index) const {
   // FIXME: Remove this.
-  return getAttributes(Index).Raw();
+  return pImpl ? pImpl->Raw(Index) : 0;
 }
 
 /// getAttributes - The attributes for the specified index are returned.