Merge "Only fail on known-bad grep configurations."