Revert "Merge branch 'trello-69' into dryad-dev"

This reverts commit 55fd1a952aee8185c440fcf31eee056f958f3c2d, reversing
changes made to a0ae1f85fd664bc0f581aad45df6044b97abd845.