[FIXED JENKINS-23522] Defend against stack overflows when a listener (unnecessarily) called super from a deprecated method.
Fixes #1295 a little differently.