Follow up on #3295

2 comments remain in the review of #3295