[BC break] Changes introduced in v3.2.4-v3.2.7 are excluded in v3.3.0

[cvmiert]

I ran into the same issue as reported in #288 and realized its fix was dropped in v3.3.0.

It looks to me like the v3 branch never got merged into the main branch while development continued there.

[wilsonge]

This affects us in @joomla too - I've tried a PR to resolve conflicts here: #310 - but neds a maintainer to review it as I'm not an expert on this project :(