Re-follow up to #65145a4 [skip ci]