Backout ac4a74c8e510 for bustage, bug 843631, on a CLOSED TREE