In case someone bumps into this and still needs the patch, here is the update...