Rebase from the original source