Back out c74ce1905b96 (bug 832848) for not actually building
CLOSED TREE