Revert "Merge branch 'master_fresh' of https://github.com/kevinbrink/CP3_Enhancement into master_fresh"

This reverts commit a54dce8ca7d31bdafff8c22906f33d73a7823e5b, reversing
changes made to aad7e8e2f425be6da21eccfdaed77af435f84a8b.