Will this break anything? Wondering if we should do this in v2 instead.