Yeah, let's create an issue for this replacement.
Nothing needs to be done in this PR.

NTC