ae25afd5a6
This fixes install/18153 by Johnny C. Lam. Base for fix provided by Tyler Retzlaff. Tested by Tyler, Grant Beattie & me.