This reverts commit d6bc55ae2d. Paperwork not ready for Felix Klee; will reapply once that's in place.
d6bc55ae2d