Should this code be made real?  We don't usually merge in commented out code.