[Git][ghc/ghc][wip/spj-reinstallable-base2] 10 commits: Revert "Better specification for when to disable defaulting"