This reverts commit 50e7bff7. Reverts submodule changes. Sigh, the haskeline commit isn't quite upstream yet.