Follow-up for post-commit suggestion on: 28afaed6 The comments were partly copied from the original code, but not updated to match the new code.
