Merge "Revert "Switch default value to match Mendel config.""