Merge "Move back to BSD grep, and make it available for recovery too."