This patch is manually crafted and contains changes that couldn't be handled
automatically.