Adding back some comments lost in a recent commit