Update comment again
Land #3353, this time for real