Revert "(Almura) Backport 'Remove chunks from queue if we don't need them anymore' commit"

This reverts commit a3f8a61a0bfb7d33f07a297199978b8835a09b9a.