Revert "Improvements in csv export for usage data"

This reverts commit a4e583cffbd2dbe2e431c306c389a0b0815073e1

Fixes bug 1183441, bug 1183230, bug 1183310.
Merge "Revert "Improvements in csv export for usage data""