BACKOUT of 64c2b25224fa (Bug 915002) due to burnage