[Git][ghc/ghc][wip/T17521] 2 commits: Fix bad 3