Revert partially one of the previous optimizations, was causing some unwanted noisy stuff