Revert "Workaround signal misfires"

This reverts commit 73f3e72b6aa5425e33cb4c1f41f30518c23f0ab1.

I believe I accidentally fixed this with
0d3ac0a19d83d7a457c27913858f7cdcfbcc4043 and if not, I want to know.