Backed out changeset 3ba8ed8f13de (bug 839913) for bustage.