Don't explode if we have a file with 0 or 2+ Erlang terms. Also remove TODO, actually I don't think we can do better.
Merge bug 26253
stable to default