switch back to proper data-server
Merge pull request #1932 from birarda/master

switch back to proper data-server