Try to fix the random reboot issue

- inline with kk_2.7
- credits to @someone755
- reverts changes from July 7/8