Back out c34781199047 (bug 997145) for wrong-tree build bustage