as the fixes are still not in upstream, gonna publish this on my own now.