Undo a buggy change in https://github.com/haskell/cabal/commit/1ecd69c7127be446b42e736d72b5d6956a40db52