Backed out changeset 825e5d09c5ec (bug 791670)
Backed out changeset 8ee18c517127 (bug 881590)