Follow-up to d9710212 [skip ci]