Issue #2284545 by Dano Manion: remove commented code.