Follow up to #6011
Follow up to #6011