Only remove wpid when replacing by final image.