Merge "Fix a typo that was causing two index values to be commented out."