We've started using `raise e from None` instead of the older `reraise`, verify and change if necessary.