My earlier patch for installing non-xs extensions takes care of the caveat removed by the attached patch.