Fixes CAS-1294; restores 3.5.0 and prior behavior