Backed out changeset 75fa13b20c1d (bug 837326)
Backed out changeset 7cbc024b3c77 (bug 837326)
Backed out changeset 2b0640fa5b18 (bug 837326) for Windows build failures on a CLOSED TREE