XXX add basic support for taking upgrade events though the regular request processing path