Add back some apparently lost commits
Add back some lost commits