Agreed, but if we decide to remove this let's do it outside of this PR.