Reverting most changes