This is a temporary workaround for amerge,
until format renegociation is implemented.

Should fix trac ticket #1400.