And avoid decoding and re-encoding embedded images where possible.
This will create a new commit in order to revert the existing changes.
