Bug 1091900 - Fix build on CLOSED TREE