Drop 5 of my patches that have been integrated upstream.