Revert "move assistant to system API"

This reverts commit c441856bb6c5712efab9d5ef422c95210884a1d8.
5 files changed