undeleting some stuff that got killed in rebase