fixes #3428

Straightjackets are a maintainability issue and don't fulfill any need handcuffs do not