Revert "use temporary migration queues"

This reverts commit b3506d7296bcff9d0f0d5f1787f3affbb3f05923.

(cherry picked from commit 8d27a386984ae54c9afaae536c3f19e5c09b0076)