Hand-apply 0ee1e8c65e2977638375a8f96dbea201210aac98 from master; comment fix.