[v5]

[DerManoMann]

Fixes #1540

Looking at packagist stats this will affect about 1.5% of users. Moving to 8.1 would bump that number up to 12.5% which seems a bit much in one go.

Plan is to move forward to v5 reasonably soon after 8.4 is out.