The fix broke a lot of Cycles regression tests. Reverting for now. This reverts commit 6b9c41719b.
6b9c41719b