Backed out changeset 1d484a770816 (bug 1060936) for breaking non-unified builds