Fix commit thinkos from splitting out patches.