Why is this commented out? Should it go back in? Can it go away?