Revert "s4:registry/util - Don't include the trailing '\0' in the internal data forma...