It should have been done in commit b9af92eb.

By the way, fix a font decoration issue.

[skip ci]

(cherry picked from commit 91ff4ef7)