Same critique here as above.  We need to actually maintain back compat here.