This reverts the Haskell part of commit 326ca0f690, because these changes broke the 'scientific' build with GHC 7.4.2.
326ca0f690