Reverted fix for [CDF-228], conflicted with [CDF-216]