These hacks are a good sign that we're trying to prematurely force a clean separation where there isn't one. AV should not be reaching deep into AP internals like this to "install" itself. We'd be in a better position if we unwind this a little bit and hang on to the expectation that AP depends on AV. No compat breakage, no awkward setup code, no confusing division of responsibilities across separate components.