SONARJAVA-285 Revert as this lead to side effects which we cannot handle yet