Rename this config item to match.
Merge bug26107