Revert "return to stock tools"

This reverts commit 6979c3073b4692c3879271cc27f1b781725c0114.