This reverts commit 557359f925, reversing changes made to 1e6c09a803.
557359f925
1e6c09a803
dyn* Trait: Trait