Re-add RDI mixin changes