Bug 1064029: Unbreak the tree. r=bustage