Back out 191a71ff02bf (bug 960899)
CLOSED TREE