IDEA-97945
optimisation
thread safe
cleanup
reverted
correctly reverted