Revert recent trait related changes
Restore recent trait related changes

This reverts commit 561b067809c0684b77f01f7f9fb72b51c207c936.