Follow-up to bug 1083211 to fix non-unified build breakage. r=bustage, a=philor. CLOSED TREE.

--HG--
extra : rebase_source : 0e0365064e25c9fd47ea5f5d2cbdc31309ce17af