WP-1116: rearrange image field.