Revert "Merge pull request #898 from guardian/configured-trail-issue"