move v2 spec to v1 and make it work again