Revert "Experimental hboot changes"

This reverts commit 97b18fe6811150640a01fc55238d1b436f5fc6e9.
Correct update bootstrap
Fix update bootstrap script
Again fix..