Merge "Revert "Switch to PCRE grep.""