Revert efea2ba1, signal monitor deadline tweak, if favor of a better,
future fix.

(cherry picked from commit aefe1e3c89a410178145f7b7a788b041841c6ffa)