Fix committed as described in my previous comment. Hopefully this will make things easier for people, even if it isn't perfect.
Fix committed as described in my previous comment. Hopefully this will make things easier for people, even if it isn't perfect.