Changing again the server vars management ; reverting some changes to use branches the way they're supposed to be used