If we go with your solution we'll want this line deleted, not commented out.