fix it

OK, this should do the trick.

Committed on my Chromebook, thus I know the tests rnu on ARM, also tested on my Intel box ;) and ran the live-iso build example as a test case.

Explanation of the details are in my e-mail answer with the censored title ;)