diff --git a/runtime/asm_support.h b/runtime/asm_support.h
index 98fe0fa..0a57c9a 100644
--- a/runtime/asm_support.h
+++ b/runtime/asm_support.h
@@ -30,7 +30,7 @@
 #if !defined(USE_BAKER_OR_BROOKS_READ_BARRIER)
 
 // Offsets within java.lang.Class.
-#define CLASS_COMPONENT_TYPE_OFFSET 12
+#define CLASS_COMPONENT_TYPE_OFFSET 16
 
 // Array offsets.
 #define ARRAY_LENGTH_OFFSET 8
@@ -54,7 +54,7 @@
 #else
 
 // Offsets within java.lang.Class.
-#define CLASS_COMPONENT_TYPE_OFFSET 20
+#define CLASS_COMPONENT_TYPE_OFFSET 24
 
 // Array offsets.
 #define ARRAY_LENGTH_OFFSET 16
diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index d3eb615..8563c8a 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -503,7 +503,7 @@
   // The size of java.lang.Class.class.
   static uint32_t ClassClassSize() {
     // The number of vtable entries in java.lang.Class.
-    uint32_t vtable_entries = Object::kVTableLength + 69;
+    uint32_t vtable_entries = Object::kVTableLength + 68;
     return ComputeClassSize(true, vtable_entries, 3, 1, 0);
   }