Partial revert of "Replace some OnMouseUp/Down events with OnClick"