Contribution tokens with option values display values, not label

To replicate on dmaster:

• Edit any contribution to add a value for the custom field How long have you been a donor?.
• With Find Contributions, search for that contribution and create either an email or thank-you letter.
• Use a token to display the value of How long have you been a donor?.
• Print/send.

Expected result

The token should render the label of the selected option, e.g. "Less than 1 year", "1-3 years".

Observed result

The token renders the value, e.g., "1", "2".

Contact tokens behave in the expected way.

Note: This is not, AFAICT, a regression. While I can't find other user reports on this, I also don't see any indication in the code that this ever was accounted for.