Revert "Merge pull request #584 from guardian/dev-error-tracking"
Revert "Merge pull request #575 from guardian/dev-error-tracking"