Revert "Fix watchdog"

This reverts commit 54b61df91415d5d0c02c8d43c8555055164c54ba.

Change-Id: If7116bc2408d2950a33508a642580cb4aafa325e
3 files changed