Undoing changes that we think might be causing the issue

It might be useful to make this into a real queue implementation, but this is fine for now.