Tweaked configuration setting to work with upstream changes