Reverted r21251 as this solution was no good - functions called by loop_parameters still required the cdp.
The command used was: svn merge -r21251:r21250 .
Authored by: bugman 2013-10-27
Parent: [r21264]
Child: [r21266]
