Roll back the ConstStringRef change for now