--- src/xdrv/xf86Wacom.c.old	Sun May 30 22:46:45 2010
+++ src/xdrv/xf86Wacom.c	Sun May 30 22:48:57 2010
@@ -582,14 +582,11 @@
 	if (InitValuatorClassDeviceStruct(local->dev, nbaxes,
 #if WCM_XINPUTABI_MAJOR == 0
 					  xf86GetMotionEvents,
-					  local->history_size,
 #else
 					  GetMotionHistory,
-					  GetMotionHistorySize(),
 #endif
 					  ((priv->flags & ABSOLUTE_FLAG) ?
-					  Absolute : Relative) | 
-					  OutOfProximity ) == FALSE)
+					  Absolute : Relative)) == FALSE)
 	{
 		ErrorF("unable to allocate Valuator class device\n");
 		return FALSE;
@@ -925,18 +922,6 @@
 		}
 		pos += cnt;
 
-		if (common->wcmDevCls != &gWacomUSBDevice) 
-		{
-			common->wcmPktLength = 9;
-			data = common->buffer + pos;
-			if ( data[0] & 0x18 )
-			{
-				if (common->wcmMaxCapacity)
-					common->wcmPktLength = 7;
-				else
-					common->wcmPktLength = 5;
-			}
-		}
 	}
  
 	if (pos)