Merge "Rephrase tooltip-rollback for clarity"