Revert 79bb60d a3aeffb c5db241 due to some reboot reports

investigate later