Backout cset b40ebe8c5273 because it's not the right patch for Bug 828715