Please revert commit d21155a3e9b51df946766926bc6155c8972c4439.

[Peter Hutterer]

On Sat, Jan 03, 2009 at 10:28:46PM -0500, Thomas Jaeger wrote:
> http://cgit.freedesktop.org/xorg/xserver/commit/?id=d21155a3e9b51df946766926bc6155c8972c4439
> 
> Here's the correct link to the thread where this was previously discussed:
> http://lists.freedesktop.org/archives/xorg/2008-June/035943.html

> In current X servers, the button field is a bit mask, so functions such
> as XSetPointerMapping and XQueryDeviceState behave incorrectly right now.

http://cgit.freedesktop.org/xorg/xserver/patch/?id=a85f0d6b98237d8a196de624207acf1983a1859a

Looks like this needs to be cherry-picked. Can you confirm this please?

Cheers,
  Peter