Un-comment-out code fixing previous fix. . . .