CP_speedup.diff applies and build fine