ms-queue: revert Brian D. changes