Remove patch that was integrated upstream.
Reorder lines a bit.