Revert some more changes from the RocksDB development tree.