Move part of the Watchdog patch back into the correct patch

I have no idea how I managed to mess this up