Revert "Revert "Revert "Build tools adjustment"""

This reverts commit 3f4b951809dcc7f3e82f7aa1e592e08a7853835f.