Revert "Second attempt, no weird traits"

This reverts commit b1a19d8af173fb955b973ed52881e92a802e5993.