Backed out changeset 82d5d92a3eac (bug 915555) for build failures on a CLOSED TREE