I think its out of scope for this PR.

We should remove that requirement, that is my point.