This reverts commit 79759fea, reversing
changes made to dc36f4df.

While not strictly required by the protocol,
it will make testing easier.

Setuptools was updated and our hacky namespace-package-chickens came
back to roost. This removes the unsupported namespace package hacks.