reverse changes from r3912

src/cdi_int.h

src/resource_handle.c

src/resource_handle.h

src/resource_unpack.c

src/stream.c