Backed out changeset 25742a510944 (bug 1855158) for causing non-unified build bustage...