Revert "Experimental hboot changes"

This reverts commit 3dd3e799a1c12242d13f1656a3758e9d9e58d577.