I think we should get rid of this trait completely...