then instead of deprecating that in v1 engine, we can just cut the behavior over at the point enable-v2-engine becomes True by default?