This reverts commit a0a7e276a4. We figured out the errors, so we don't need this any more.
a0a7e276a4