revert of the revert (it's a good idea to have it like this because of problems with e.g. --text-only and binary content)