Remove two patches that have been integrated upstream.