Replace the flaky atomic queue with a safer mutex-based one

Replace the flaky atomic queue with a safer mutex-based one #487