Revert "Get rid of temporary testing workarounds haskell/cabal#1810"

This reverts commit 189bb1d22424cb0a2ae6c7f03f775e76794938a3.