When applying this patch, should I also update it to the most recent
upstream commit (d5ff2f4666ce24e41fb4ca22476c782c070e6f6e)?