Fix for #5532 and the last of the infection changes, I hope