This was broken by a legacy attachment path conditional that is no longer needed.
Fixes #5149 and enables a few additional safe hoists.