Remove some smaller changes again.