Revert "Bugfix: Allow dynamic registering of new tools"

OK, seriously, this is the second to last time I will use the "just got back from 7 weeks off" defense.

This reverts commit ef8b4a30b5399b35ffe5e20a831dd5be0e835c35.

Change-Id: I04ae922a335e55d68a279f3417288716a0c25d01