Api updates, almost done!
Revert "Api updates, almost done!"

This reverts commit dd877bcd64649c62a259ff456bbc79563cb1a592.