This reverts commit 387f1d1e. Bizarrely, this commit accidentally added libraries/haskell98. So I'll revert it entirely and start again.