Undo some changes.
Remove unnecessary test.