Do some stuff with namespace -revert this
Revert "Do some stuff with namespace -revert this"

This reverts commit d4c170eb6e9bf323bd6614a018fed8fc6be6a414.