Revert back some of the mouse code