Back out unrelated changes to mouse cursor handling