This reverts commit 5819f4a4. This caused bots to fail with a crash/assert during the fold, so some constraint was missed.