I figure you just commented this out because it's possible folks may ask for it to be restored; once that's finalized, let's make sure and nuke the commented-out stuff as required.