FTR, this is the bug report for it:
It’s not been backported to stable, but there should be another major version release around the end of July so hopefully your workaround won’t have to hold up too long. 
3 Likes