This reverts commit c46b41aaa6. Multiple tests time out, either due to performance hit (see comment) or a cycle.
c46b41aaa6