undo a few problematic commits