Merge "Remove vestigial config setting." into nyc-andromeda-dev