some more nit-picking: just remove the comment, I think it's misleading -- this should only be mentioned in the commit message