Revert "Fix api routing from namespace to scope"

This reverts commit 7da3aa3c235702636b54a823196b71c1fc9df2ce.