Backed out changeset c4921ed6aef3 (bug 949775)