Attempt to reduce unnecessary chunk saving for #623.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>