Backed out changeset 23400439c1da (bug 242448) for breaking non-unified builds