Revert "cm AV"

This reverts commit 6baedfd1c7de29c7436caf5f6a57559938062a06.