When entity rewrite is disabled from waterfall.yml file, settings get reset each time you switch servers.   This only happens since 24b7e51ed557baf3dbdeeb5ca94f445f08007127 upstream update.