Revert "Fix namespace use"

This reverts commit ff5fd15d43ba14c9df5cb587d4b255977d81f57d.