Back out bug 952890, since the dependencies aren't fixed yet.