Restored Traits backwards compatibility.