I have to undo these fixes, but then I will need to rebuild db