Addressing comments by Krinkle on r85885. Removing commented-out code. Verified that...