Merge "Remove vestigial config setting."