Comment 2 for bug 1933665

I'm working through this ATM. We will have to introduce an option to control the prepare-image behavior with respect to this. The initial setting will be backward compatible, with warnings that we will switch the default around at a later point.