This reverts commit a87fccb3. A test appears to fail with expensive checks. Reverting while I investigate.