Reverted this after accidental change for kd scenario.