Remove patch now that #2126707 is fixed.