Comment 2 for bug 1675025

Thanks Galen! I pushed this into master, 2.11 and 2.10, but since today is 2.12.0 release day, Galen said he will handle picking this commit into 2.12 after the release.