Backing out last commit.  It fixed what I was trying to fix but caused a regression on ListQueues.  Related to #28.