I think I'll remove that block completely. See comments in NotificationActionService.java.