Add AOT class out of system

Had undesired side effects for development workflow