Revert "Merge pull request #12322 from davidflanagan/autocorrect-config"

This reverts commit 38456b0b9ee903e597d2a2fd949c10fd673e1993, reversing
changes made to 6b0a8108eac92ab3b5e73946c57f750fe8744356.