Some changes from previous commit restored.