13997f0050
This reverts commit 41e4bc4d9f.
This commit requires additional testing before recommitting as it causes
issues with FindJoint().