Shouldn't this be using the new config option that can be set in the admin UI?