Move back to Gson after compiler change