Revert fix for zlib build break

latest zlib has our fix applied so we can drop the patch