Revert old commit and fix neon activation