Revert "Change namespace manager!"

This reverts commit 72ed915c6497b3dee1d3c089a24422b90f64e700.