undo portable/usb datadir changes

The portable/usb datadir changes were moved to a separate branch for now.