Revert "Re-enable AVS"

This reverts commit 0def966b3a840e74ccaeadde2b054a1643ef7458.