This reverts commit da72685c8b. Something broke. See #242. Will debug this and roll forward later.
da72685c8b