Backporting #730 will involve reverting to previous behavior when queues are recovered. The check for `oldName != newName` will have to be removed.