Back out 6690c6da6cc6 (bug 848150) for test bustage
CLOSED TREE