[Git][ghc/ghc][wip/fix-bagger] WIP