Revert "Attempt 3, remove traits form list"

This reverts commit 2234e33ee3c6469799a0346f54eaf2505afa7cf4.