Simplify boot storage

OK, if "temporary" has a deadline :)