Removing obsolete and commented out configuration. Possibly related to GCP-9697.