diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java
index a542bfbe3db1502c97d4c4b47737aaa193157a40..bc425999293966dac1830ad40549ce25a8c54f47 100644
--- a/core/java/src/net/i2p/util/NativeBigInteger.java
+++ b/core/java/src/net/i2p/util/NativeBigInteger.java
@@ -179,17 +179,6 @@ public class NativeBigInteger extends BigInteger {
       * @return A string containing the CPU-type or null if CPU type is unknown
       */
     private static String resolveCPUType() {
-        if (_is64) {
-            // Test the 64 bit libjcpuid, even though we don't use it yet
-            try {
-                CPUInfo c = CPUID.getInfo();
-                _cpuModel = c.getCPUModelString();
-            } catch (UnknownCPUException e) {
-                // log?
-            }
-            return JBIGI_OPTIMIZATION_ATHLON64;
-        }
-        
         try {
             CPUInfo c = CPUID.getInfo();
             try {
diff --git a/history.txt b/history.txt
index c85e669da92ec67540e57527d24c0b25dfc0525e..3668ced701dcbc831edd89e0e8668b4fbda42dde 100644
--- a/history.txt
+++ b/history.txt
@@ -22,6 +22,7 @@
         http://sponge.i2p/files/jbigi/gmp-4.3.2/
         The 4.3.2 files are half the size of those built with GMP 5.0.2, and there was
         little or no performance difference between the two versions for 32 bit processors.
+    * NBI: Enable 64-bit processor detection
     * Profiles: Skip and delete a corrupt profile read from disk
 
 2011-06-10 kytv
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 0bd65feeba84f6cd091ba15583ed22772843bfc2..7f0b07e778675e95dfd205a9742ccd0cccc2aeee 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 23;
+    public final static long BUILD = 24;
 
     /** for example "-test" */
     public final static String EXTRA = "";