I agree with the `XXX` part. We won't address that in this PR though.