Revert "Restored Traits backwards compatibility."

This reverts commit fc5aa323f4bedc8e4606187e66508811bff17afe.