I had the same problem and commented out the patch/fix as well and it removed the error.
First, thank you for being the only person to help find a fix (I've had a call for help on the site for a few weeks for the same error).
Second, if there is a better way to handle, someone please let me/us/everyone know.