Revert "Build tools adjustment"

This reverts commit 313835b63d94c423d2aa37b606568af27a89eff1.