SONARCS-435 Fix the broken toolkit