Revert "layout boot"

This reverts commit 67f2bb03688b58f3ae725971cf307c8c6f8e612d.