Revert "Significant (15%) bytes-allocated reduction in haddock.Cabal and haddock.base"
Revert "Significant (15%) bytes-allocated reduction in haddock.Cabal and haddock.base"

This reverts commit c3c9babf10990ccc36451b3758d6f19d749b879d.

lukexi/ghc,tjakway/ghcjvm,ezyang/ghc,gcampax/ghc,TomMD/ghc,bitemyapp/ghc,frantisekfarka/ghc-dsi,AlexanderPankiv/ghc,snoyberg/ghc,tibbe/ghc,ezyang/ghc,AlexanderPankiv/ghc,mcschroeder/ghc,mfine/ghc,vTurbine/ghc,mcschroeder/ghc,fmthoma/ghc,lukexi/ghc,olsner/ghc,AlexanderPankiv/ghc,acowley/ghc,wxwxwwxxx/ghc,nathyong/microghc-ghc,ml9951/ghc,vTurbine/ghc,bitemyapp/ghc,acowley/ghc,lukexi/ghc,nushio3/ghc,anton-dessiatov/ghc,mcschroeder/ghc,GaloisInc/halvm-ghc,hferreiro/replay,fmthoma/ghc,ghc-android/ghc,acowley/ghc,vTurbine/ghc,nushio3/ghc,gcampax/ghc,holzensp/ghc,snoyberg/ghc,AlexanderPankiv/ghc,lukexi/ghc,christiaanb/ghc,shlevy/ghc,nkaretnikov/ghc,mfine/ghc,ryantm/ghc,sgillespie/ghc,mcschroeder/ghc,wxwxwwxxx/ghc,elieux/ghc,forked-upstream-packages-for-ghcjs/ghc,da-x/ghc,mfine/ghc,ghc-android/ghc,elieux/ghc,ryantm/ghc,oldmanmike/ghc,ezyang/ghc,GaloisInc/halvm-ghc,sdiehl/ghc,gcampax/ghc,wxwxwwxxx/ghc,mfine/ghc,sdiehl/ghc,jstolarek/ghc,wxwxwwxxx/ghc,acowley/ghc,sgillespie/ghc,ghc-android/ghc,green-haskell/ghc,urbanslug/ghc,snoyberg/ghc,nkaretnikov/ghc,christiaanb/ghc,ezyang/ghc,hferreiro/replay,tjakway/ghcjvm,holzensp/ghc,da-x/ghc,ghc-android/ghc,spacekitteh/smcghc,TomMD/ghc,holzensp/ghc,olsner/ghc,shlevy/ghc,fmthoma/ghc,nathyong/microghc-ghc,nkaretnikov/ghc,olsner/ghc,sgillespie/ghc,snoyberg/ghc,olsner/ghc,mettekou/ghc,GaloisInc/halvm-ghc,vTurbine/ghc,AlexanderPankiv/ghc,nkaretnikov/ghc,ghc-android/ghc,tjakway/ghcjvm,mcschroeder/ghc,sgillespie/ghc,green-haskell/ghc,siddhanathan/ghc,gcampax/ghc,urbanslug/ghc,jstolarek/ghc,ezyang/ghc,jstolarek/ghc,nkaretnikov/ghc,GaloisInc/halvm-ghc,ryantm/ghc,tjakway/ghcjvm,frantisekfarka/ghc-dsi,TomMD/ghc,mfine/ghc,christiaanb/ghc,siddhanathan/ghc,gridaphobe/ghc,hferreiro/replay,vikraman/ghc,sdiehl/ghc,frantisekfarka/ghc-dsi,green-haskell/ghc,forked-upstream-packages-for-ghcjs/ghc,mfine/ghc,gridaphobe/ghc,wxwxwwxxx/ghc,mettekou/ghc,forked-upstream-packages-for-ghcjs/ghc,christiaanb/ghc,green-haskell/ghc,siddhanathan/ghc,nushio3/ghc,vTurbine/ghc,oldmanmike/ghc,mfine/ghc,acowley/ghc,da-x/ghc,holzensp/ghc,ml9951/ghc,vikraman/ghc,gridaphobe/ghc,siddhanathan/ghc,da-x/ghc,forked-upstream-packages-for-ghcjs/ghc,mettekou/ghc,snoyberg/ghc,christiaanb/ghc,acowley/ghc,mettekou/ghc,nathyong/microghc-ghc,elieux/ghc,GaloisInc/halvm-ghc,frantisekfarka/ghc-dsi,ml9951/ghc,hferreiro/replay,mettekou/ghc,ryantm/ghc,hferreiro/replay,nkaretnikov/ghc,vikraman/ghc,green-haskell/ghc,AlexanderPankiv/ghc,TomMD/ghc,tibbe/ghc,elieux/ghc,wxwxwwxxx/ghc,mcschroeder/ghc,siddhanathan/ghc,ghc-android/ghc,lukexi/ghc,anton-dessiatov/ghc,nathyong/microghc-ghc,nathyong/microghc-ghc,forked-upstream-packages-for-ghcjs/ghc,GaloisInc/halvm-ghc,sgillespie/ghc,TomMD/ghc,mettekou/ghc,nushio3/ghc,urbanslug/ghc,ml9951/ghc,urbanslug/ghc,hferreiro/replay,shlevy/ghc,TomMD/ghc,shlevy/ghc,frantisekfarka/ghc-dsi,ml9951/ghc,forked-upstream-packages-for-ghcjs/ghc,nkaretnikov/ghc,gcampax/ghc,shlevy/ghc,ml9951/ghc,oldmanmike/ghc,mettekou/ghc,jstolarek/ghc,olsner/ghc,elieux/ghc,tjakway/ghcjvm,gcampax/ghc,sdiehl/ghc,urbanslug/ghc,nathyong/microghc-ghc,vikraman/ghc,oldmanmike/ghc,christiaanb/ghc,nushio3/ghc,ryantm/ghc,fmthoma/ghc,tibbe/ghc,GaloisInc/halvm-ghc,urbanslug/ghc,tibbe/ghc,ml9951/ghc,bitemyapp/ghc,elieux/ghc,anton-dessiatov/ghc,ghc-android/ghc,lukexi/ghc-7.8-arm64,siddhanathan/ghc,wxwxwwxxx/ghc,vikraman/ghc,ezyang/ghc,tjakway/ghcjvm,elieux/ghc,spacekitteh/smcghc,forked-upstream-packages-for-ghcjs/ghc,da-x/ghc,jstolarek/ghc,fmthoma/ghc,acowley/ghc,shlevy/ghc,hferreiro/replay,bitemyapp/ghc,tibbe/ghc,lukexi/ghc-7.8-arm64,sgillespie/ghc,nathyong/microghc-ghc,gridaphobe/ghc,snoyberg/ghc,da-x/ghc,anton-dessiatov/ghc,gridaphobe/ghc,christiaanb/ghc,fmthoma/ghc,sdiehl/ghc,shlevy/ghc,sgillespie/ghc,ezyang/ghc,ml9951/ghc,vikraman/ghc,oldmanmike/ghc,gcampax/ghc,holzensp/ghc,anton-dessiatov/ghc,olsner/ghc,gridaphobe/ghc,TomMD/ghc,nushio3/ghc,lukexi/ghc-7.8-arm64,nushio3/ghc,vikraman/ghc,AlexanderPankiv/ghc,urbanslug/ghc,fmthoma/ghc,anton-dessiatov/ghc,oldmanmike/ghc,gridaphobe/ghc,lukexi/ghc-7.8-arm64,sdiehl/ghc,sdiehl/ghc,da-x/ghc,snoyberg/ghc,tjakway/ghcjvm,olsner/ghc,bitemyapp/ghc,spacekitteh/smcghc,mcschroeder/ghc,siddhanathan/ghc,vTurbine/ghc,spacekitteh/smcghc,oldmanmike/ghc,spacekitteh/smcghc,lukexi/ghc-7.8-arm64,vTurbine/ghc,anton-dessiatov/ghc