Merge "Remove an unnecessary C library workaround and regenerate the patch."