Switch back to what it was and change retrofit instead