Reverted Bartender Changes