Backed out changeset fdb8b52bea5c (bug 1077687) for bustage.