Revert to known good commit

Looks like we're merging by hand