One approach that works in this specific case would be to manually move the margin-left
from the img to the parent span:
$('img').each(function () {
var imgClass = $(this).attr('class');
$(this).wrap('<span class="image-wrap ' + imgClass + '" style="width: auto; height: auto;"/>').removeClass(imgClass)
.parent().css('margin-left',$(this).css('margin-left')).end()
.css('margin-left',0);
});