Restored dodgy rebase