Revert libzlib merge conflict change