[ci skip] Revert some cosmetic changes from PR #2524, for consistency