Follow up on #2809