This reverts commit 3ad8db20. We ended up not needing that namespace, and I'd rather not have the churn for producing diffs.