Backed out changeset 16fc740d96f5 (bug 996780) for build test failures on a CLOSED TREE