Bug 841059 - Follow-up fix for broken root analysis build; r=bustage