Another API fix to support switching between dev and live