undo previous commits, get back to NYTimes master