diff --git a/src/tools/python.jam b/src/tools/python.jam
index 3f266d905..118ba9123 100644
--- a/src/tools/python.jam
+++ b/src/tools/python.jam
@@ -311,18 +311,7 @@ rule init-nt ( version : root ? : includes ? : libraries ? : cygwin-condition ?
         # The name of Python library file does not have a dot between
         # major and minor version. 
         local PYTHON_VERSION_NODOT = [ regex.match ([0-9]+)[.]([0-9]+).* : $(version) : 1 2 ] ;
-        if $(PYTHON_VERSION_NODOT)
-        {
-            PYTHON_VERSION_NODOT = $(PYTHON_VERSION_NODOT[1])$(PYTHON_VERSION_NODOT[2]) ;
-        }
-        else
-        {
-            # Try to link to 'python' lib, without version. Probably won't
-            # work, but better that not passing any library name at all.
-            PYTHON_VERSION_NODOT = "" ;
-        }
-        
-        
+        PYTHON_VERSION_NODOT = $(PYTHON_VERSION_NODOT:J="") ;
         
         PYTHON_DLL ?= [ GLOB $(PATH) $(Path) : python$(PYTHON_VERSION_NODOT).dll ] ;
         PYTHON_DEBUG_DLL ?= [ GLOB $(PATH) $(Path) : python$(PYTHON_VERSION_NODOT)_d.dll ] ;