XD-933: Remove unneeded workaround HATEOAS bug