Revert "Merge pull request #321 from RAOF/aot-cpu-safety"