Rebase the previous patch