Any reason not the remove the commented-out part (here and everywhere else this is done)?