Bug 1013586 - Backout diagnostic patch 2e9bcf014247.