Revert "Use lockless fifo 'pop' algorithm."

This reverts commit 009fb7967902106843f25803680fd72355b041fa.