Backed out changeset 645cb4fbf390 (bug 842132) for build bustage.