cherry-pick/revert: error-help message rewording.