Revert "Made it theoretically impossible (yeah right) to break tools"

This reverts commit 645b5a8346c8ac59ccb9147f1deefe892bb9a499.
It was causing more issues than it fixed.