Make wrenching tables apart not drop the wrench

Fixes #3116 and fixes #3172