CLOSED TREE Backed out changeset 5e8145eff457 (bug 1154231) Backed out changeset 951fb8ed6f25 (bug 1154231)