Revert "Revert "Build tools adjustment""

This reverts commit 2373edabff465417de748a3d5cc9f2a46af9ccdc.