Revert "v3 api in making"

This reverts commit 99a7703a94238555a75a776ee7a0fbd44529ddc7.