Pull some comments in from 4f60303570