Fix for CDF-183: CDF Samples not running in 4.8.0