This should have been just putting things back the way they were before I started messing around.  Compare to c17404e.