This likely exacerbates the non-determinism in ghc package ids, so until that is fixed let's live with the slow builds. This reverts commit 817c0e41.