Upstream fixed the issue in version 4.8. We now have 4.21.