Revert most of the product changes
Use ConfigurationScope.INSTANCE