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

Revert "Merge pull request #898 from guardian/configured-trail-issue"
Merge branch 'master' into griddle-redux