Created by: clusterfack
Fixes #4024 (closed) Fixes #4023 (closed)
Machine unwrenching should work fine again