Remove use of the deprecated "ConfigurationHolder"