Fix to the config so that we don't have to stash then pop every time we want to pull down changes on the server.