Backed out changeset c72a49a66333 (bug 1058158) for Mn bustage
CLOSED TREE