2a39292b85
This reverts commit e93dbf2ecf.
Causes weird stability issues as the process received sig 15 and
restarts, which is strange!