Reversed a few things that should have stayed but were taken out.