Can this field be completely removed in master?