Bug 844148 Followup to compile with external linkage r=irving