Support for reading 2.1 log files and upgrading from 2.1 store files

No, I want to check the returned and the given buffer are actually the _same_ object.