Bug 985876 - Follow-up: Fix non-unified builds on a CLOSED TREE. no_r