Get rid of code which breaks Multi-ISO boot [Testing: issue1273]