Apply change from #1221 manually.

Avoid the unintentional slight in OPs commit message.