r19655: Jeremy, please review: