[Git][ghc/ghc][wip/T27737] More work in progress