[DF-1063] Recovered previous fix.