reverted changes and no more diamond use because of jenkins
another diamond interference