Revert "updated for cf v6 beta"

This reverts commit 50f700947c3e87784b8f9a07db08cffc44c5a3ea.