Core patch: Remove watchdogs