This will not be backward compatible.  Do we care?