diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c4d39b4089..94241e02a8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-10-29 00:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/win_os.prg
+    * Reverted 2010-10-22 19:08 UTC+0200
+      Turns out it was alright without the fix, as hb_osIsWinVista()
+      returns .T. also for upper versions (win7) by design, so it was not
+      necessary to change it to win_osIsVistaOrUpper() hbwin specific call.
+      Please double check it though, maybe I'm just too tired.
+
 2010-10-28 23:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/qtcore/hbqt_misc.prg
     + Changed to not RTE when disconnecting not-connected
@@ -617,7 +625,7 @@
   * harbour/src/rtl/Makefile
     * NSCTP -> LPP
 
-2010-10-23 19:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+2010-10-22 19:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbwin/win_os.prg
     ! Fixed all Vista stuff to also apply to above Vista.
 
diff --git a/harbour/contrib/hbwin/win_os.prg b/harbour/contrib/hbwin/win_os.prg
index 5a82c7f328..6e2f4b6d72 100644
--- a/harbour/contrib/hbwin/win_os.prg
+++ b/harbour/contrib/hbwin/win_os.prg
@@ -79,7 +79,7 @@ FUNCTION WIN_OSNETREGOK( lSetIt, lDoVista )
       lDoVista := .T.
    ENDIF
 
-   IF ! lDoVista .AND. win_osIsVistaOrUpper()
+   IF ! lDoVista .AND. hb_osIsWinVista()
       /* do nothing */
    ELSEIF hb_osIsWin9x()
       bRetVal := win_regQuery( WIN_HKEY_LOCAL_MACHINE, "System\CurrentControlSet\Services\VxD\VREDIR", "DiscardCacheOnOpen", 1, lSetIt )
@@ -98,7 +98,7 @@ FUNCTION WIN_OSNETREGOK( lSetIt, lDoVista )
       bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeySrv, "SharingViolationDelay", 0, lSetIt )
       bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeySrv, "SharingViolationRetries", 0, lSetIt )
 
-      IF win_osIsVistaOrUpper()
+      IF hb_osIsWinVista()
          /* If SMB2 is enabled turning off oplocks does not work, so SMB2 is required to be turned off on Server. */
          bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeySrv, "SMB2", 0, lSetIt )
       ENDIF
@@ -110,7 +110,7 @@ FUNCTION WIN_OSNETREGOK( lSetIt, lDoVista )
       bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeyWks, "UtilizeNtCaching", 0, lSetIt )
       bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeyWks, "UseLockReadUnlock", 0, lSetIt )
 
-      IF win_osIsVistaOrUpper()
+      IF hb_osIsWinVista()
          bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeyWks, "FileInfoCacheLifetime", 0, lSetIt )
          bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeyWks, "FileNotFoundCacheLifetime", 0, lSetIt )
          bRetVal := bRetVal .AND. win_regQuery( WIN_HKEY_LOCAL_MACHINE, cKeyWks, "DirectoryCacheLifetime", 0, lSetIt )