This reverts commit bd0ae7ec.

Seems a problem with signals, but without test cases I can't fix
it for now.