Issue #2416: The temporary repair of cc.follow