If this introduces a problem for multithreading, I think we should avoid the change.
The goal is to converge towards thread-safety, not to diverge from it, isn't it?