Revert the previous commit and move clearConfig to when we are reloading