Split the patch into two commits.