Backed out changeset 4c12508e3b69 (bug 1039666) for conflicts with bug 1037424