Due to #1912 we were writing binaries to disk with the encoding. We need to do some additional juggling when dealing with binary data.
