Backed out changeset 56606aa26f45 (bug 1053185)