Revert "mousedown / mouseup fix"

This reverts commit ca06c9a7d85c47eaa5a2a1d82765a9f25986c6f0.
Revert "Revert "mousedown / mouseup fix""

This reverts commit 7029d076924b79907061f14e57de3d89c0a0b3fe.