Backed out changeset 15516aebd58d (bug 477948)