Revert previous change because of thread errors...