Revert "Merge branch 'fix/Queue_scan_consolidation' into edge"

This reverts commit b4f9b9b5b4186df5a681dc63cd4174c543cd41d7, reversing
changes made to d97f94e3d8782e77793011430bb38784640b1f6f.

needs more work