Reverting some rebase changes.