- up to pre3054 (fs layout changes to match upstream, now some files in datadir)