Reverted a change that was not ready in config class