Yeah... It worries me to think that after an upgrade an event might just stop working and what that might mean for history/query data afterwards if this is the go to workaround. I wish there were logs that could help shine a light on the issue under the hood but I don't know the platform well.