Fix build breakage due to rebase
Fix build breakage due to rebase

sgillespie/ghc,sdiehl/ghc,shlevy/ghc,sgillespie/ghc,vTurbine/ghc,ezyang/ghc,olsner/ghc,shlevy/ghc,snoyberg/ghc,shlevy/ghc,snoyberg/ghc,ezyang/ghc,mettekou/ghc,sdiehl/ghc,vTurbine/ghc,sgillespie/ghc,shlevy/ghc,olsner/ghc,mettekou/ghc,sdiehl/ghc,ezyang/ghc,ezyang/ghc,mettekou/ghc,sgillespie/ghc,snoyberg/ghc,shlevy/ghc,vTurbine/ghc,olsner/ghc,mettekou/ghc,olsner/ghc,shlevy/ghc,olsner/ghc,sdiehl/ghc,mettekou/ghc,sgillespie/ghc,mettekou/ghc,olsner/ghc,shlevy/ghc,ezyang/ghc,snoyberg/ghc,snoyberg/ghc,vTurbine/ghc,sgillespie/ghc,ezyang/ghc,mettekou/ghc,sdiehl/ghc,sdiehl/ghc,vTurbine/ghc,ezyang/ghc,sgillespie/ghc,sdiehl/ghc,olsner/ghc,vTurbine/ghc,snoyberg/ghc,vTurbine/ghc,snoyberg/ghc