Revert "Merge pull request #1758 from dan-t/master"
Revert "Merge pull request #1758 from dan-t/master"

This reverts commit 3c7a740847e987c0c11750cab97c2859cb43cc27, reversing
changes made to 68d9077c5f091200f87308e032e7c05ff5ea250d.

themoritz/cabal,triplepointfive/cabal,fugyk/cabal,mydaum/cabal,trskop/cabal,valderman/cabal,enolan/cabal,sopvop/cabal,kolmodin/cabal,typelead/epm,ghc-android/cabal,Peaker/cabal,corngood/cabal,themoritz/cabal,edsko/cabal,randen/cabal,x-y-z/cabal,Peaker/cabal,thomie/cabal,headprogrammingczar/cabal,seereason/cabal,triplepointfive/cabal,themoritz/cabal,Heather/cabal,christiaanb/cabal,Helkafen/cabal,mmakowski/cabal,plow-technologies/cabal,beni55/cabal,lukexi/cabal,martinvlk/cabal,valderman/cabal,mightybyte/cabal,seereason/cabal,plow-technologies/cabal,typelead/epm,eric-stanley/cabal,corngood/cabal,edsko/cabal,gridaphobe/cabal,rimmington/cabal,trskop/cabal,mightybyte/cabal,fugyk/cabal,gbaz/cabal,thomie/cabal,mmakowski/cabal,lukexi/cabal,anton-dessiatov/cabal,sopvop/cabal,garetxe/cabal,sopvop/cabal,plumlife/cabal,Helkafen/cabal,kosmikus/cabal,enolan/cabal,bennofs/cabal,gbaz/cabal,ghc-android/cabal,kolmodin/cabal,randen/cabal,beni55/cabal,plumlife/cabal,x-y-z/cabal,headprogrammingczar/cabal,ian-ross/cabal,rimmington/cabal,martinvlk/cabal,gridaphobe/cabal,mydaum/cabal,christiaanb/cabal,Heather/cabal,eric-stanley/cabal,thoughtpolice/cabal,bennofs/cabal,kosmikus/cabal,thoughtpolice/cabal,ian-ross/cabal,anton-dessiatov/cabal,garetxe/cabal