Per Torsten, we may need to remove this item from the removals list.
Let's prep a merge request if that turns out to be the case.