* partly revert ccca64eee3c457ce91db2327df04d8e92a6824ee
* revert 45b834fbddcbf55e7e6bf874929e56ee36d6e122
* revert e4c6ec9de00c3fbf07ed3058410ed35b7f17b470

The real fixes for the crash on log rotate were commited later on and this brought pretty bad behavior.