Merge pull request #5148 from haskell/2.2-revert-4383

Cabal/Distribution/PackageDescription.hs

Cabal/Distribution/PackageDescription/Check.hs

Cabal/Distribution/PackageDescription/Configuration.hs

Cabal/Distribution/PackageDescription/FieldGrammar.hs

Cabal/Distribution/Simple/Build.hs

Cabal/Distribution/Simple/Configure.hs

Cabal/Distribution/Types/BuildInfo.hs

Cabal/Distribution/Types/PackageDescription.hs

Cabal/Distribution/Types/PackageDescription/Lens.hs

Cabal/changelog

Cabal/tests/ParserTests/regressions/Octree-0.5.expr

Cabal/tests/ParserTests/regressions/common.expr

Cabal/tests/ParserTests/regressions/common2.expr

Cabal/tests/ParserTests/regressions/elif.expr

Cabal/tests/ParserTests/regressions/elif2.expr

Cabal/tests/ParserTests/regressions/encoding-0.8.expr

Cabal/tests/ParserTests/regressions/generics-sop.expr

...ts/ParserTests/regressions/haddock-api-2.18.1-check.check

Cabal/tests/ParserTests/regressions/issue-5055.expr

Cabal/tests/ParserTests/regressions/issue-774.expr