I'm with @rhattersley here. Let's leave CF alone in this PR.