This was reverted due to the revert of Queue API