Backed out changeset 71190bec18a7 (bug 817058) for build bustage.