Revert "Migrate datadirectories"

This reverts commit 03f290bbf77cfd127b20c1813d94fff8e2e1bd6b.