Backed out changeset cb1fdb7df155 (bug 915002) again for build bustage