--- a/hotspot/src/os/aix/vm/os_aix.cpp	Fri Dec 02 11:07:27 2016 +0100
+++ b/hotspot/src/os/aix/vm/os_aix.cpp	Mon Dec 05 17:57:43 2016 +0100
@@ -547,11 +547,7 @@
     if (pslash != NULL) {
       pslash = strrchr(buf, '/');
       if (pslash != NULL) {
-        *pslash = '\0';          // Get rid of /<arch>.
-        pslash = strrchr(buf, '/');
-        if (pslash != NULL) {
-          *pslash = '\0';        // Get rid of /lib.
-        }
+        *pslash = '\0';        // Get rid of /lib.
       }
     }
     Arguments::set_java_home(buf);