Removed unneeded hack code (which caused crashing due to reading/writing to same target from 2 threads).