This reverts commit d4facda4. This has been reported to cause failures. Reverting while I investigate.