Switched to using proper event handlers for URL revocation