Revert "Attempt to fix missing usage data" and tiny improvement

This reverts commit 5a1a8f83b33e1dc509f10cbcf3e50bb86cc0dffa.
And corrects the timestamp calculation on some usage data.