Not going to block on this, but it might be nice to remove the `redesign` flag test while we're here.