Reverting some more changes.