backout 275cd395f9fa and  9e4b22851976 bug 716140 for breaking linux tp on a CLOSED TREE