Follow-up to https://github.com/r-lib/pillar/pull/686.
Follow-up to #686.