1c8d80e12d
This reverts commit c0c396f008.
Causes weird stability issues as the process received sig 15 and
restarts, which is strange!