This line is also added in the gaia patch for bug 890427, I think, so this one or that one may have a merge conflict.