Merge "Remove -z option."