DATAREST-93 - Hope to fix build.