--- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2013-10-25 15:28:52.000000000 +0200
+++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2013-10-25 15:28:52.000000000 +0200
@@ -2186,10 +2186,6 @@
   return JNI_OK;
 }
 
-size_t G1CollectedHeap::conservative_max_heap_alignment() {
-  return HeapRegion::max_region_size();
-}
-
 void G1CollectedHeap::ref_processing_init() {
   // Reference processing in G1 currently works as follows:
   //