Backed out changeset 8be952fedc1e (bug 966395) for build bustage