Reverted 91c1517 and reinserted the old mouse cursor code