Code

Fix problems with empty boot params by partially reverting