Revert "Merge branch 'trinity'"

This reverts commit 4356613690362f15c1a5b94c04d63c1a35208322, reversing
changes made to e6e4de9b321b78868639ab76d1b9e42febc6408e.