Fix by David Kilzer, reviewed by Darin, landed by ap (with a tweak suggested...