NOJIRA rolling back changes to this changeset as it needs to be
refactored to avoid checksum errrors