added a patch the separates this out and reuses the same config option