Commits

kh1 committed dbd06849c98
Revert the revert commits as they do not fix the crash. I was trying to fix a crash in binary format handler that I thought was caused be removing these classes. Still this wasn't the case after some debugging, and, we really don't need them.