One of the proposals was to not touch the e2e, but rather scan whatever you upload before it gets encrypted. You should be able to opt out, but in that case be unable to upload any files.
A counter argument to this specific proposal was that it would exclude people from social interactions.