Backed out changeset 1e38b4aa8889 (bug 986160) for  breaking Nightly builds
Merge m-c to cedar.
Test fix for bug 986458. We don't need no schtinkin' CLOSED TREE.