This reverts commit 8d61c6bc.

On second thought, don't do this.  API not final, and some of the stuff
might not be a good idea after all.