Revert to 4.0 CF