Undid some unnecessary changes.