Follow up on #8255