Fix patch after latest rebase.