Uncommented unnecessarily-commented-out code.
Merge branch 'mlucy_2524' into next