This reverts commit 78b1fbc6. This causes or exposes miscompiles in Rust, revert until they have been investigated.