Revert "AV"

This reverts commit 60ec72dee67cbe45ac31bbf7a0f2f7ae10f4665c.