follow up to #10102, cc @cvrebert