One way to deal with #87.
But it would be nicer to avoid this "downgrade" if we know the recipient can handle it.