Are these comments intended to be part of this commit?