No more reboot on first try

Not sure if removing omnibus is a good idea though.
Merge pull request #1269 from kewubenduben/master

No more reboot on first try