Oh bugger, it wasn't that then. Back to the drawing board.

Looks like currently the only way to guarantee a clean upload is to edit and save the image before uploading.

I'll carry on looking.