Partially mitigated with [67d30a23170591c9].