Revert "Fix Trac #7667.", restoring the refined fix.
Revert "Fix Trac #7667.", restoring the refined fix.

Apologies -- there was some git confusion that cause the Wrong Thing
to happen.

This reverts commit bb9d53e32da52221173431733928c497187686ff.

Conflicts:

	compiler/hsSyn/Convert.lhs

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