Backed out changeset 506038ddee2c (bug 1000040) for causing bug 1035172
Backed out changeset 78ba6f47a5a7 (bug 1000040) for causing bug 1035172
Backed out changeset f54af6237ce9 (bug 1000040) for causing bug 1035172