Follow up on #3702