This patch undid the previous patch, "merge from base".  I asked Sven
to revert it, but didn't get an answer.
  
See GHC bug #473.