I don't think this was supposed to have gotten into the namespaceify patch, but