Revert "Workaround signal misfires that led to crash"

This reverts commit a3f1007fe7ea7270c188798e61cd4b7e7c00190e.
Better workaround for signal misfires