Revert 6 wrong changes.