Revert "avc"

This reverts commit fda788bffa6d9051c219a5f6399e7d44b1ddc456.
Revert "Revert "avc""

This reverts commit 71c33c7d1db91be676925e5a55cc009afd40cdc6.