move this as well back to non-raw class.