Update for latest upstream; drop our custom patches.