(#2577) - WIP - fix everything but leveldb

LevelDB is broken and I don't have the patience right now to figure out why.