diff --git a/lib/CodeGen/CGVTT.cpp b/lib/CodeGen/CGVTT.cpp
index 888dcd1..cdc8133 100644
--- a/lib/CodeGen/CGVTT.cpp
+++ b/lib/CodeGen/CGVTT.cpp
@@ -183,9 +183,8 @@
     // address points.
     AddressPoint = AddressPoints.lookup(Base);
   } else {
-    AddressPoint = 
-      (*this->AddressPoints[VTableClass])[std::make_pair(Base.getBase(), 
-                                                         Base.getBaseOffset())];
+    // Just get the address point for the regular vtable.
+    AddressPoint = CGM.getVTables().getAddressPoint(Base, VTableClass);
   }
 
   if (!AddressPoint) AddressPoint = 0;