Revert "Also sync AV code with master by removing obsolete code" from last commit

Turns out it is actually not obsolete but just not implement yet