oh yeah, need the datadir...

Change-Id: I9014359f939b1658c551eeea133599364b585e30
Merge "oh yeah, need the datadir..." into production