Revert "Merge branch 'namespace_trial'"
Revert "Merge branch 'namespace_trial'"

This reverts commit 707062701dc5e1dc136a9e3e544e107eef81f7a8, reversing
changes made to 665fe6e4ebef11c45334b932b4b340aaa1e51c30.

yob/editx