Hopefully my previous commit is a better fix for some plugins