Added comments into changes in 9a96f819eb0da0c0a9a3f83b0adc13a0fbcdebaa.