This seems very likely related to your patch