Put v1 support back in.