Update to address problems reported in #457

Sorry for the trouble, I’d like to make installers to get around all of
this crap.