Revert "Merge branch 'NewDaq' into MyFit-data-scaling"
This reverts commit f6174e28e52c17b9cba213674d0e9aae00f010b4, reversing changes made to 72f6e43ce12836eabf61ad959637d4240eb1e239.