Bug 1057402: Fix for non-unified builds. r=me