Backout bug 1055595, build failures (r=backout)