Recommit of some old stuff that got overwritten