Revert "fixes to allow for setting a custom data_dir outside of ~/.ee…

Revert "fixes to allow for setting a custom data_dir outside of ~/.ee… #649