diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3ff3e05bfc..eac11eefbd 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,8 +1,18 @@
+19991010-07:28 GMT+1 Antonio Linares <alinares@fivetech.com>
+   * source/rtl/classes.c
+     - Undone latest changes from Eddie
+   * source/vm/hvm.c
+     - Undone latest changes from Eddie
+   * include/extend.h
+     - Undone latest changes from Eddie
+   (Eddie, I find your proposal very good -as all your ideas and code-
+    but this one is uncompleted and breaks actual Harbour OO architecture)
+
 19991010-02:05 GMT+1 Victor Szel <info@szelvesz.hu>
    * bin/*.bat
      ! Some minor fix in the help screens
    * doc/funclist.txt
-     + Changed the format, now the third column (which was not in use) is 
+     + Changed the format, now the third column (which was not in use) is
        meant to store the platform and multithreading support information.
    * source/compiler/harbour.y
      + One TODO added.
diff --git a/harbour/include/extend.h b/harbour/include/extend.h
index f161660014..87bc553eb4 100644
--- a/harbour/include/extend.h
+++ b/harbour/include/extend.h
@@ -198,7 +198,6 @@ typedef struct _HB_BASEARRAY
    ULONG    ulLen;        /* number of items in the array */
    USHORT   uiHolders;    /* number of holders of this array */
    USHORT   uiClass;      /* offset to the classes base if it is an object */
-   USHORT   uiPrevCls;    /* previous class handle */
    BOOL     bSuperCast;   /* is it a super cast ? */
 } BASEARRAY, * PBASEARRAY, * BASEARRAY_PTR;
 
diff --git a/harbour/source/rtl/classes.c b/harbour/source/rtl/classes.c
index fc44e3effd..0e2572a1cc 100644
--- a/harbour/source/rtl/classes.c
+++ b/harbour/source/rtl/classes.c
@@ -1074,7 +1074,6 @@ static HARBOUR hb___msgSuper( void )
 
    pSuper->item.asArray.value = pNewBase;
 
-   pNewBase->uiPrevCls  = pNewBase->uiClass;
    pNewBase->uiClass    = uiSuperCls;
    pNewBase->uiHolders  = 1;                    /* New item is returned     */
    pNewBase->bSuperCast = TRUE;                 /* Do not dispose pItems !! */
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index 50752d528d..755385a616 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -2153,7 +2153,6 @@ void hb_vmDo( USHORT uiParams )
    LONG wStackBase = hb_stack.pBase - hb_stack.pItems; /* as the stack memory block could change */
    LONG wItemIndex = pItem - hb_stack.pItems;
    PHB_ITEM pSelf = hb_stack.pPos - uiParams - 1;   /* NIL, OBJECT or BLOCK */
-   PBASEARRAY pSelfBase;
    PHB_FUNC pFunc;
    int iStatics = hb_stack.iStatics;              /* Return iStatics position */
    BOOL bDebugPrevState = s_bDebugging;
@@ -2188,18 +2187,7 @@ void hb_vmDo( USHORT uiParams )
       if( pSym == &( hb_symEval ) && IS_BLOCK( pSelf ) )
          pFunc = pSym->pFunPtr;                 /* __EVAL method = function */
       else
-      {
          pFunc = hb_objGetMethod( pSelf, pSym );
-         if( IS_OBJECT( pSelf ) )               /* Object passed            */
-         {
-            pSelfBase = pSelf->item.asArray.value;
-            if( pSelfBase->bSuperCast )
-            {
-              pSelfBase->bSuperCast = FALSE;
-              pSelfBase->uiClass    = pSelfBase->uiPrevCls;
-            }
-         }
-      }
 
       if( pFunc )
          pFunc();