Backed out changeset 7d945895a6d9 (bug 1003707) for bustage.