Work around an issue with our event subscriber, which has problems cleaning things up.