Updated to upstream version of the patch