Revert "API Update 0.8.2"

This reverts commit 919c70b0947ea5322dd56ae134a6f3d0ca62f72f.