Backout bug 1022612 (all 47 parts). It provides no benefit on Aurora. a=sylvestre