Restoring CP based implementations which were incorrectly commented out by previous greyes commit.