Revert "AS: remove strict changes of Neo"

This reverts commit 679d894aad5353e5c97a5a1c028aaa950a7f935d.