Backout 7c2fd5db93b2 (bug bug 895646) for breaking the build on a CLOSED TREE
Backout df425bca5665 (bug 893977) for breaking the build on a CLOSED TREE