Back out ee100983f921 (bug 895047) for build bustage
CLOSED TREE