Switch to using @seandst 's config code