r3917 remove stale comment and copy last change to trunk