Replace a pint of sed with a pinch of salt
Merge pull request #18819 from rallytime/cp-18222

Backport #18222 to 2014.1