Reposting with Doug's permission.

This reverts commit 82ba1e75be28be5f2e7ed36b2ac57b7bad37f562.