Created and attaching a patch that can be applied via composer to resolve this issue.
coledev → created an issue.