Backout of bug 514280 changeset c738f7348dea for build failure on a CLOSED TREE