Reintroduced two lines needed for the JSON-API