diff --git a/include/llvm/Object/YAML.h b/include/llvm/Object/YAML.h
index e6f1da1e1d4..92811b04eb3 100644
--- a/include/llvm/Object/YAML.h
+++ b/include/llvm/Object/YAML.h
@@ -43,6 +43,13 @@ public:
     assert(isBinary);
     return Data;
   }
+  /// \brief The number of bytes that are represented by this BinaryRef.
+  /// This is the number of bytes that writeAsBinary() will write.
+  ArrayRef<uint8_t>::size_type binary_size() const {
+    if (!isBinary)
+      return Data.size() / 2;
+    return Data.size();
+  }
   bool operator==(const BinaryRef &Ref) {
     // Special case for default constructed BinaryRef.
     if (Ref.Data.empty() && Data.empty())
diff --git a/tools/yaml2obj/yaml2coff.cpp b/tools/yaml2obj/yaml2coff.cpp
index 5b758471bdc..d800b90791c 100644
--- a/tools/yaml2obj/yaml2coff.cpp
+++ b/tools/yaml2obj/yaml2coff.cpp
@@ -129,9 +129,8 @@ static bool layoutCOFF(COFFParser &CP) {
   for (std::vector<COFFYAML::Section>::iterator i = CP.Obj.Sections.begin(),
                                                 e = CP.Obj.Sections.end();
                                                 i != e; ++i) {
-    StringRef SecData = i->SectionData.getHex();
-    if (!SecData.empty()) {
-      i->Header.SizeOfRawData = SecData.size()/2;
+    if (i->SectionData.binary_size() > 0) {
+      i->Header.SizeOfRawData = i->SectionData.binary_size();
       i->Header.PointerToRawData = CurrentSectionDataOffset;
       CurrentSectionDataOffset += i->Header.SizeOfRawData;
       if (!i->Relocations.empty()) {
@@ -154,7 +153,7 @@ static bool layoutCOFF(COFFParser &CP) {
   for (std::vector<COFFYAML::Symbol>::iterator i = CP.Obj.Symbols.begin(),
                                                e = CP.Obj.Symbols.end();
                                                i != e; ++i) {
-    unsigned AuxBytes = i->AuxiliaryData.getHex().size() / 2;
+    unsigned AuxBytes = i->AuxiliaryData.binary_size();
     if (AuxBytes % COFF::SymbolSize != 0) {
       errs() << "AuxiliaryData size not a multiple of symbol size!\n";
       return false;