Issue #2383043: Update code to use new configuration.