put back most of the changes