Bug 1044439 - Fix build regressions caused by bug 1038537. Partial bustage fix for a CLOSED TREE. r=jcranmer