Restore accidentaly reverted fix merged in the past.