Bug 1061948 - Use our own queue implementation