reverted 48cff86a8cfcc2b9ad0b1b4e81136c4e139a68a4, as it caused perf regress IDEA-123573