Revert "Fix race condition between merge and signal"

This reverts commit 77f4bf4fb25690fdf096e16c8bb4f6a5420fd021.